projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'CVE-2014-7975' of git://git.kernel.org/pub/scm/linux/kernel/git/luto...
[cascardo/linux.git]
/
fs
/
nilfs2
/
ioctl.c
diff --git
a/fs/nilfs2/ioctl.c
b/fs/nilfs2/ioctl.c
index
422fb54
..
9a20e51
100644
(file)
--- a/
fs/nilfs2/ioctl.c
+++ b/
fs/nilfs2/ioctl.c
@@
-1022,11
+1022,9
@@
static int nilfs_ioctl_sync(struct inode *inode, struct file *filp,
return ret;
nilfs = inode->i_sb->s_fs_info;
return ret;
nilfs = inode->i_sb->s_fs_info;
- if (nilfs_test_opt(nilfs, BARRIER)) {
- ret = blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
- if (ret == -EIO)
- return ret;
- }
+ ret = nilfs_flush_device(nilfs);
+ if (ret < 0)
+ return ret;
if (argp != NULL) {
down_read(&nilfs->ns_segctor_sem);
if (argp != NULL) {
down_read(&nilfs->ns_segctor_sem);