Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc98a42c authored by David Howells's avatar David Howells
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
parent 94e92e7a

drivers/staging/lustre/lustre/llite/llite_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt, 
	data->ocd_ibits_known = MDS_INODELOCK_FULL;

	data->ocd_version = LUSTRE_VERSION_CODE;



	if (sb->s_flags & MS_RDONLY)

	if (sb_rdonly(sb))

		data->ocd_connect_flags |= OBD_CONNECT_RDONLY;

	if (sbi->ll_flags & LL_SBI_USER_XATTR)

		data->ocd_connect_flags |= OBD_CONNECT_XATTR;
@@ -2033,7 +2033,7 @@ int ll_remount_fs(struct super_block *sb, int *flags, char *data) 
	int err;

	__u32 read_only;



	if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {

	if ((bool)(*flags & MS_RDONLY) != sb_rdonly(sb)) {

		read_only = *flags & MS_RDONLY;

		err = obd_set_info_async(NULL, sbi->ll_md_exp,

					 sizeof(KEY_READ_ONLY),

drivers/staging/lustre/lustre/llite/namei.c

+1 −2
Original line number Diff line number Diff line
@@ -562,8 +562,7 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry, 
		}

	}



	if (it->it_op & IT_OPEN && it->it_flags & FMODE_WRITE &&

	    dentry->d_sb->s_flags & MS_RDONLY)

	if (it->it_op & IT_OPEN && it->it_flags & FMODE_WRITE && sb_rdonly(dentry->d_sb))

		return ERR_PTR(-EROFS);



	if (it->it_op & IT_CREAT)

fs/affs/amigaffs.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ affs_error(struct super_block *sb, const char *function, const char *fmt, ...) 
	vaf.fmt = fmt;

	vaf.va = &args;

	pr_crit("error (device %s): %s(): %pV\n", sb->s_id, function, &vaf);

	if (!(sb->s_flags & MS_RDONLY))

	if (!sb_rdonly(sb))

		pr_warn("Remounting filesystem read-only\n");

	sb->s_flags |= MS_RDONLY;

	va_end(args);

fs/affs/bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ affs_count_free_blocks(struct super_block *sb) 


	pr_debug("%s()\n", __func__);



	if (sb->s_flags & MS_RDONLY)

	if (sb_rdonly(sb))

		return 0;



	mutex_lock(&AFFS_SB(sb)->s_bmlock);

fs/affs/super.c

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ void affs_mark_sb_dirty(struct super_block *sb) 
	struct affs_sb_info *sbi = AFFS_SB(sb);

	unsigned long delay;



	if (sb->s_flags & MS_RDONLY)

	if (sb_rdonly(sb))

	       return;



	spin_lock(&sbi->work_lock);
@@ -464,7 +464,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) 
	 * not recommended.

	 */

	if ((chksum == FS_DCFFS || chksum == MUFS_DCFFS || chksum == FS_DCOFS

	     || chksum == MUFS_DCOFS) && !(sb->s_flags & MS_RDONLY)) {

	     || chksum == MUFS_DCOFS) && !sb_rdonly(sb)) {

		pr_notice("Dircache FS - mounting %s read only\n", sb->s_id);

		sb->s_flags |= MS_RDONLY;

	}
@@ -596,7 +596,7 @@ affs_remount(struct super_block *sb, int *flags, char *data) 
	memcpy(sbi->s_volume, volume, 32);

	spin_unlock(&sbi->symlink_lock);



	if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))

	if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))

		return 0;



	if (*flags & MS_RDONLY)