From 650dbdee23996bed01afa9da70c622296631bb38 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 19 Apr 2010 19:05:48 -0400 Subject: [PATCH] --- yaml --- r: 192309 b: refs/heads/master c: b157b06ca24514ef4b766cabb8e852c950040923 h: refs/heads/master i: 192307: 5ba86f2fe57ed2dc0aa7019af121b5523a501a46 v: v3 --- [refs] | 2 +- trunk/fs/nfs/super.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cdeb59390e3b..50ee99eb4389 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce587e07ba2e25b5c9d286849885b82676661f3e +refs/heads/master: b157b06ca24514ef4b766cabb8e852c950040923 diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c index 50c6c282ba40..ee051a40fac8 100644 --- a/trunk/fs/nfs/super.c +++ b/trunk/fs/nfs/super.c @@ -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: