ima: Remove redundant conditional operator

[mirror_ubuntu-bionic-kernel.git] / fs / sync.c

diff --git a/fs/sync.c b/fs/sync.c
index 2a54c1f2203595823df1bd97680b9a1fb163e400..a576aa2e6b0902662814476fa20d9551e432d930 100644 (file)
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -57,7 +57,7 @@ int sync_filesystem(struct super_block *sb)
        /*
         * No point in syncing out anything if the filesystem is read-only.
         */
-       if (sb->s_flags & MS_RDONLY)
+       if (sb_rdonly(sb))
                return 0;
 
        ret = __sync_filesystem(sb, 0);
@@ -69,13 +69,13 @@ EXPORT_SYMBOL(sync_filesystem);
 
 static void sync_inodes_one_sb(struct super_block *sb, void *arg)
 {
-       if (!(sb->s_flags & MS_RDONLY))
+       if (!sb_rdonly(sb))
                sync_inodes_sb(sb);
 }
 
 static void sync_fs_one_sb(struct super_block *sb, void *arg)
 {
-       if (!(sb->s_flags & MS_RDONLY) && sb->s_op->sync_fs)
+       if (!sb_rdonly(sb) && sb->s_op->sync_fs)
                sb->s_op->sync_fs(sb, *(int *)arg);
 }
 
@@ -335,14 +335,9 @@ SYSCALL_DEFINE4(sync_file_range, int, fd, loff_t, offset, loff_t, nbytes,
                goto out_put;
 
        mapping = f.file->f_mapping;
-       if (!mapping) {
-               ret = -EINVAL;
-               goto out_put;
-       }
-
        ret = 0;
        if (flags & SYNC_FILE_RANGE_WAIT_BEFORE) {
-               ret = filemap_fdatawait_range(mapping, offset, endbyte);
+               ret = file_fdatawait_range(f.file, offset, endbyte);
                if (ret < 0)
                        goto out_put;
        }
@@ -355,7 +350,7 @@ SYSCALL_DEFINE4(sync_file_range, int, fd, loff_t, offset, loff_t, nbytes,
        }
 
        if (flags & SYNC_FILE_RANGE_WAIT_AFTER)
-               ret = filemap_fdatawait_range(mapping, offset, endbyte);
+               ret = file_fdatawait_range(f.file, offset, endbyte);
 
 out_put:
        fdput(f);