X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=fs%2Fnilfs2%2Fioctl.c;h=9a20e513d7eb89ee21228e6af0a723996c4150a5;hb=0ef3a56b1c466629cd0bf482b09c7b0e5a085bb5;hp=422fb54b73771f04690e16726f9a85a74c4febfd;hpb=209f6c37540a6cc1c74333a7ede0da729488a8cd;p=cascardo%2Flinux.git

diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index 422fb54b7377..9a20e513d7eb 100644
--- 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;
-	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);