Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-gy0-f174.google.com ([209.85.160.174]:63398 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753494Ab2ALPUe (ORCPT ); Thu, 12 Jan 2012 10:20:34 -0500 Received: by ghbg16 with SMTP id g16so311074ghb.19 for ; Thu, 12 Jan 2012 07:20:33 -0800 (PST) From: Peng Tao To: Trond Myklebust Cc: linux-nfs@vger.kernel.org, mdw@umich.edu, honey@citi.umich.edu, Peng Tao , Benny Halevy Subject: [PATCH-v2 6/9] pnfsblock: clean up _add_entry Date: Thu, 12 Jan 2012 23:18:45 +0800 Message-Id: <1326381528-2232-7-git-send-email-bergwolf@gmail.com> In-Reply-To: <1326381528-2232-1-git-send-email-bergwolf@gmail.com> References: <1326381528-2232-1-git-send-email-bergwolf@gmail.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: It is wrong to kmalloc in _add_entry() as it is inside spinlock. memory should be already allocated _add_entry() is called. Signed-off-by: Peng Tao Signed-off-by: Benny Halevy --- fs/nfs/blocklayout/extents.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/fs/nfs/blocklayout/extents.c b/fs/nfs/blocklayout/extents.c index f383524..d0f52ed 100644 --- a/fs/nfs/blocklayout/extents.c +++ b/fs/nfs/blocklayout/extents.c @@ -110,13 +110,7 @@ static int _add_entry(struct my_tree *tree, u64 s, int32_t tag, return 0; } else { struct pnfs_inval_tracking *new; - if (storage) - new = storage; - else { - new = kmalloc(sizeof(*new), GFP_NOFS); - if (!new) - return -ENOMEM; - } + new = storage; new->it_sector = s; new->it_tags = (1 << tag); list_add(&new->it_link, &pos->it_link); -- 1.7.1.262.g5ef3d