diff options
| author | David Howells <dhowells@redhat.com> | 2017-07-17 10:45:34 +0300 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2017-07-17 10:45:34 +0300 |
| commit | bc98a42c1f7d0f886c0c1b75a92a004976a46d9f (patch) | |
| tree | 42a30f4f8d1aa3723f5356f2a5697b23317e2e19 /init | |
| parent | 94e92e7ac90d06e1e839e112d3ae80b2457dbdd7 (diff) | |
| download | linux-bc98a42c1f7d0f886c0c1b75a92a004976a46d9f.tar.xz | |
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 'init')
| -rw-r--r-- | init/do_mounts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index c2de5104aad2..bf7ea36ca286 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -373,7 +373,7 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data) printk(KERN_INFO "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n", s->s_type->name, - s->s_flags & MS_RDONLY ? " readonly" : "", + sb_rdonly(s) ? " readonly" : "", MAJOR(ROOT_DEV), MINOR(ROOT_DEV)); return 0; } |