diff options
author | David Howells <dhowells@redhat.com> | 2017-07-17 03:45:34 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2017-07-17 03:45:34 -0400 |
commit | bc98a42c1f7d0f886c0c1b75a92a004976a46d9f (patch) | |
tree | 42a30f4f8d1aa3723f5356f2a5697b23317e2e19 /fs/btrfs/volumes.c | |
parent | 94e92e7ac90d06e1e839e112d3ae80b2457dbdd7 (diff) |
VFS: Convert sb->s_flags & MS_RDONLY to sb_rdonly(sb)
Firstly by applying the following with coccinelle's spatch:
@@ expression SB; @@
-SB->s_flags & MS_RDONLY
+sb_rdonly(SB)
to effect the conversion to sb_rdonly(sb), then by applying:
@@ expression A, SB; @@
(
-(!sb_rdonly(SB)) && A
+!sb_rdonly(SB) && A
|
-A != (sb_rdonly(SB))
+A != sb_rdonly(SB)
|
-A == (sb_rdonly(SB))
+A == sb_rdonly(SB)
|
-!(sb_rdonly(SB))
+!sb_rdonly(SB)
|
-A && (sb_rdonly(SB))
+A && sb_rdonly(SB)
|
-A || (sb_rdonly(SB))
+A || sb_rdonly(SB)
|
-(sb_rdonly(SB)) != A
+sb_rdonly(SB) != A
|
-(sb_rdonly(SB)) == A
+sb_rdonly(SB) == A
|
-(sb_rdonly(SB)) && A
+sb_rdonly(SB) && A
|
-(sb_rdonly(SB)) || A
+sb_rdonly(SB) || A
)
@@ expression A, B, SB; @@
(
-(sb_rdonly(SB)) ? 1 : 0
+sb_rdonly(SB)
|
-(sb_rdonly(SB)) ? A : B
+sb_rdonly(SB) ? A : B
)
to remove left over excess bracketage and finally by applying:
@@ expression A, SB; @@
(
-(A & MS_RDONLY) != sb_rdonly(SB)
+(bool)(A & MS_RDONLY) != sb_rdonly(SB)
|
-(A & MS_RDONLY) == sb_rdonly(SB)
+(bool)(A & MS_RDONLY) == sb_rdonly(SB)
)
to make comparisons against the result of sb_rdonly() (which is a bool)
work correctly.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r-- | fs/btrfs/volumes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 5eb7217738ed..6646695c9072 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -2337,7 +2337,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path | |||
2337 | int seeding_dev = 0; | 2337 | int seeding_dev = 0; |
2338 | int ret = 0; | 2338 | int ret = 0; |
2339 | 2339 | ||
2340 | if ((sb->s_flags & MS_RDONLY) && !fs_info->fs_devices->seeding) | 2340 | if (sb_rdonly(sb) && !fs_info->fs_devices->seeding) |
2341 | return -EROFS; | 2341 | return -EROFS; |
2342 | 2342 | ||
2343 | bdev = blkdev_get_by_path(device_path, FMODE_WRITE | FMODE_EXCL, | 2343 | bdev = blkdev_get_by_path(device_path, FMODE_WRITE | FMODE_EXCL, |
@@ -4085,7 +4085,7 @@ int btrfs_pause_balance(struct btrfs_fs_info *fs_info) | |||
4085 | 4085 | ||
4086 | int btrfs_cancel_balance(struct btrfs_fs_info *fs_info) | 4086 | int btrfs_cancel_balance(struct btrfs_fs_info *fs_info) |
4087 | { | 4087 | { |
4088 | if (fs_info->sb->s_flags & MS_RDONLY) | 4088 | if (sb_rdonly(fs_info->sb)) |
4089 | return -EROFS; | 4089 | return -EROFS; |
4090 | 4090 | ||
4091 | mutex_lock(&fs_info->balance_mutex); | 4091 | mutex_lock(&fs_info->balance_mutex); |