Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 192309
b: refs/heads/master
c: b157b06
h: refs/heads/master
i:
  192307: 5ba86f2
v: v3
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed May 14, 2010
1 parent 6e23cf4 commit 650dbde
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ce587e07ba2e25b5c9d286849885b82676661f3e
refs/heads/master: b157b06ca24514ef4b766cabb8e852c950040923
8 changes: 4 additions & 4 deletions trunk/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 650dbde

Please sign in to comment.