From 338e2ffce877812c085ffa5679a3258784e71f8c Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Thu, 20 Sep 2012 20:37:23 -0400 Subject: [PATCH] --- yaml --- r: 333147 b: refs/heads/master c: 579342785f7069d32e9637ef30d59c4256dcec3d h: refs/heads/master i: 333145: 610ff1c771805730df8de6ffa6e3543af7c5d97c 333143: 97df73fe86b49b0496430506bda1930be55ecc65 v: v3 --- [refs] | 2 +- trunk/fs/nfs/pnfs.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 233e65d9e321..89b849a0d12c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9136d4914f61110ca9897ec65ab620075c50298 +refs/heads/master: 579342785f7069d32e9637ef30d59c4256dcec3d diff --git a/trunk/fs/nfs/pnfs.c b/trunk/fs/nfs/pnfs.c index edc8288fd3d4..fcc72ecf2fd7 100644 --- a/trunk/fs/nfs/pnfs.c +++ b/trunk/fs/nfs/pnfs.c @@ -200,8 +200,7 @@ static struct pnfs_layout_hdr * pnfs_alloc_layout_hdr(struct inode *ino, gfp_t gfp_flags) { struct pnfs_layoutdriver_type *ld = NFS_SERVER(ino)->pnfs_curr_ld; - return ld->alloc_layout_hdr ? ld->alloc_layout_hdr(ino, gfp_flags) : - kzalloc(sizeof(struct pnfs_layout_hdr), gfp_flags); + return ld->alloc_layout_hdr(ino, gfp_flags); } static void @@ -218,7 +217,7 @@ pnfs_free_layout_hdr(struct pnfs_layout_hdr *lo) spin_unlock(&clp->cl_lock); } put_rpccred(lo->plh_lc_cred); - return ld->alloc_layout_hdr ? ld->free_layout_hdr(lo) : kfree(lo); + return ld->free_layout_hdr(lo); } static void