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

Commit b157b06c authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Cleanup file handle allocations in fs/nfs/super.c 



Use the new helper functions instead of open coding.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent ce587e07

fs/nfs/super.c

+4 −4
Original line number Diff line number Diff line
@@ -2176,7 +2176,7 @@ static int nfs_get_sb(struct file_system_type *fs_type, 
	int error = -ENOMEM;



	data = nfs_alloc_parsed_mount_data(3);

	mntfh = kzalloc(sizeof(*mntfh), GFP_KERNEL);

	mntfh = nfs_alloc_fhandle();

	if (data == NULL || mntfh == NULL)

		goto out_free_fh;
@@ -2251,7 +2251,7 @@ static int nfs_get_sb(struct file_system_type *fs_type, 
	kfree(data->fscache_uniq);

	security_free_mnt_opts(&data->lsm_opts);

out_free_fh:

	kfree(mntfh);

	nfs_free_fhandle(mntfh);

	kfree(data);

	return error;
@@ -2560,7 +2560,7 @@ static int nfs4_remote_get_sb(struct file_system_type *fs_type, 
	};

	int error = -ENOMEM;



	mntfh = kzalloc(sizeof(*mntfh), GFP_KERNEL);

	mntfh = nfs_alloc_fhandle();

	if (data == NULL || mntfh == NULL)

		goto out_free_fh;
@@ -2618,7 +2618,7 @@ static int nfs4_remote_get_sb(struct file_system_type *fs_type, 
out:

	security_free_mnt_opts(&data->lsm_opts);

out_free_fh:

	kfree(mntfh);

	nfs_free_fhandle(mntfh);

	return error;



out_free: