Skip to content

Commit

Permalink
NFS: Cleanup file handle allocations in fs/nfs/super.c
Browse files Browse the repository at this point in the history
Use the new helper functions instead of open coding.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed May 14, 2010
1 parent ce587e0 commit b157b06
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fs/nfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit b157b06

Please sign in to comment.