Commit 436058a4 authored by David Howells's avatar David Howells Committed by David S. Miller
Browse files

[AFS]: Handle multiple mounts of an AFS superblock correctly. 



Handle multiple mounts of an AFS superblock correctly, checking to see
whether the superblock is already initialised after calling sget()
rather than just unconditionally stamping all over it.

Also delete the "silent" parameter to afs_fill_super() as it's not
used and can, in any case, be obtained from sb->s_flags.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63b6be55

fs/afs/super.c

+16 −10
Original line number Original line Diff line number Diff line
@@ -212,7 +212,7 @@ static int afs_test_super(struct super_block *sb, void *data) 
/*

/*

 * fill in the superblock

 * fill in the superblock

 */

 */

static int afs_fill_super(struct super_block *sb, void *data, int silent)

static int afs_fill_super(struct super_block *sb, void *data)

{

{

	struct afs_mount_params *params = data;

	struct afs_mount_params *params = data;

	struct afs_super_info *as = NULL;

	struct afs_super_info *as = NULL;
@@ -319,17 +319,23 @@ static int afs_get_sb(struct file_system_type *fs_type, 
		goto error;

		goto error;

	}

	}





	if (!sb->s_root) {

		/* initial superblock/root creation */

		_debug("create");

		sb->s_flags = flags;

		sb->s_flags = flags;



		ret = afs_fill_super(sb, &params);

	ret = afs_fill_super(sb, &params, flags & MS_SILENT ? 1 : 0);

		if (ret < 0) {

		if (ret < 0) {

			up_write(&sb->s_umount);

			up_write(&sb->s_umount);

			deactivate_super(sb);

			deactivate_super(sb);

			goto error;

			goto error;

		}

		}

		sb->s_flags |= MS_ACTIVE;

		sb->s_flags |= MS_ACTIVE;

	simple_set_mnt(mnt, sb);

	} else {

		_debug("reuse");

		ASSERTCMP(sb->s_flags, &, MS_ACTIVE);

	}





	simple_set_mnt(mnt, sb);

	afs_put_volume(params.volume);

	afs_put_volume(params.volume);

	afs_put_cell(params.default_cell);

	afs_put_cell(params.default_cell);

	_leave(" = 0 [%p]", sb);

	_leave(" = 0 [%p]", sb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE