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

Commit 9249e17f authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

VFS: Pass mount flags to sget() 



Pass mount flags to sget() so that it can use them in initialising a new
superblock before the set function is called.  They could also be passed to the
compare function.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f015f126

drivers/mtd/mtdsuper.c

+1 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static struct dentry *mount_mtd_aux(struct file_system_type *fs_type, int flags, 
	struct super_block *sb;

	int ret;



	sb = sget(fs_type, get_sb_mtd_compare, get_sb_mtd_set, mtd);

	sb = sget(fs_type, get_sb_mtd_compare, get_sb_mtd_set, flags, mtd);

	if (IS_ERR(sb))

		goto out_error;
@@ -74,8 +74,6 @@ static struct dentry *mount_mtd_aux(struct file_system_type *fs_type, int flags, 
	pr_debug("MTDSB: New superblock for device %d (\"%s\")\n",

	      mtd->index, mtd->name);



	sb->s_flags = flags;



	ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0);

	if (ret < 0) {

		deactivate_locked_super(sb);

fs/9p/vfs_super.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ v9fs_fill_super(struct super_block *sb, struct v9fs_session_info *v9ses, 
	if (v9ses->cache)

		sb->s_bdi->ra_pages = (VM_MAX_READAHEAD * 1024)/PAGE_CACHE_SIZE;



	sb->s_flags = flags | MS_ACTIVE | MS_DIRSYNC | MS_NOATIME;

	sb->s_flags |= MS_ACTIVE | MS_DIRSYNC | MS_NOATIME;

	if (!v9ses->cache)

		sb->s_flags |= MS_SYNCHRONOUS;
@@ -137,7 +137,7 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags, 
		goto close_session;

	}



	sb = sget(fs_type, NULL, v9fs_set_super, v9ses);

	sb = sget(fs_type, NULL, v9fs_set_super, flags, v9ses);

	if (IS_ERR(sb)) {

		retval = PTR_ERR(sb);

		goto clunk_fid;

fs/afs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static struct dentry *afs_mount(struct file_system_type *fs_type, 
	as->volume = vol;



	/* allocate a deviceless superblock */

	sb = sget(fs_type, afs_test_super, afs_set_super, as);

	sb = sget(fs_type, afs_test_super, afs_set_super, flags, as);

	if (IS_ERR(sb)) {

		ret = PTR_ERR(sb);

		afs_put_volume(vol);
@@ -406,7 +406,6 @@ static struct dentry *afs_mount(struct file_system_type *fs_type, 
	if (!sb->s_root) {

		/* initial superblock/root creation */

		_debug("create");

		sb->s_flags = flags;

		ret = afs_fill_super(sb, &params);

		if (ret < 0) {

			deactivate_locked_super(sb);

fs/btrfs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -1068,7 +1068,8 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, 
	}



	bdev = fs_devices->latest_bdev;

	s = sget(fs_type, btrfs_test_super, btrfs_set_super, fs_info);

	s = sget(fs_type, btrfs_test_super, btrfs_set_super, flags | MS_NOSEC,

		 fs_info);

	if (IS_ERR(s)) {

		error = PTR_ERR(s);

		goto error_close_devices;
@@ -1082,7 +1083,6 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, 
	} else {

		char b[BDEVNAME_SIZE];



		s->s_flags = flags | MS_NOSEC;

		strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id));

		btrfs_sb(s)->bdev_holder = fs_type;

		error = btrfs_fill_super(s, fs_devices, data,

fs/ceph/super.c

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type, 


	if (ceph_test_opt(fsc->client, NOSHARE))

		compare_super = NULL;

	sb = sget(fs_type, compare_super, ceph_set_super, fsc);

	sb = sget(fs_type, compare_super, ceph_set_super, flags, fsc);

	if (IS_ERR(sb)) {

		res = ERR_CAST(sb);

		goto out;