diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-09-20 20:37:23 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-09-28 16:03:16 -0400 |
commit | 579342785f7069d32e9637ef30d59c4256dcec3d (patch) | |
tree | 343497ec99e6aa8f1ba2e08f02f0ca0b185f2768 /fs | |
parent | a9136d4914f61110ca9897ec65ab620075c50298 (diff) |
NFSv4.1: Remove unused 'default allocation' for pnfs_alloc_layout_hdr()
...and ditto for pnfs_free_layout_hdr()
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/pnfs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index edc8288fd3d..fcc72ecf2fd 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c | |||
@@ -200,8 +200,7 @@ static struct pnfs_layout_hdr * | |||
200 | pnfs_alloc_layout_hdr(struct inode *ino, gfp_t gfp_flags) | 200 | pnfs_alloc_layout_hdr(struct inode *ino, gfp_t gfp_flags) |
201 | { | 201 | { |
202 | struct pnfs_layoutdriver_type *ld = NFS_SERVER(ino)->pnfs_curr_ld; | 202 | struct pnfs_layoutdriver_type *ld = NFS_SERVER(ino)->pnfs_curr_ld; |
203 | return ld->alloc_layout_hdr ? ld->alloc_layout_hdr(ino, gfp_flags) : | 203 | return ld->alloc_layout_hdr(ino, gfp_flags); |
204 | kzalloc(sizeof(struct pnfs_layout_hdr), gfp_flags); | ||
205 | } | 204 | } |
206 | 205 | ||
207 | static void | 206 | static void |
@@ -218,7 +217,7 @@ pnfs_free_layout_hdr(struct pnfs_layout_hdr *lo) | |||
218 | spin_unlock(&clp->cl_lock); | 217 | spin_unlock(&clp->cl_lock); |
219 | } | 218 | } |
220 | put_rpccred(lo->plh_lc_cred); | 219 | put_rpccred(lo->plh_lc_cred); |
221 | return ld->alloc_layout_hdr ? ld->free_layout_hdr(lo) : kfree(lo); | 220 | return ld->free_layout_hdr(lo); |
222 | } | 221 | } |
223 | 222 | ||
224 | static void | 223 | static void |