From: Peng Tao <bergwolf@gmail.com>
To: Trond.Myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, Peng Tao <peng_tao@emc.com>
Subject: [PATCH 6/9] pnfsblock: clean up _add_entry
Date: Fri, 2 Dec 2011 20:46:20 -0800 [thread overview]
Message-ID: <1322887583-2719-7-git-send-email-bergwolf@gmail.com> (raw)
In-Reply-To: <1322887583-2719-1-git-send-email-bergwolf@gmail.com>
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 <peng_tao@emc.com>
---
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
next prev parent reply other threads:[~2011-11-29 16:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-03 4:46 [PATCH 0/9] pnfsblock patches Peng Tao
2011-11-29 18:44 ` Jim Rees
2011-11-30 2:37 ` tao.peng
2011-11-30 13:05 ` Benny Halevy
2011-11-30 13:25 ` Peng Tao
2011-11-29 21:38 ` Boaz Harrosh
2011-11-29 22:58 ` Jim Rees
2011-11-29 23:39 ` Boaz Harrosh
2011-11-30 2:44 ` tao.peng
2011-12-03 4:46 ` [PATCH 1/9] pnfsblock: cleanup bl_mark_sectors_init Peng Tao
2011-12-03 4:46 ` [PATCH 3/9] pnfsblock: move find lock page logic out of bl_write_pagelist Peng Tao
2011-12-03 4:46 ` [PATCH 4/9] pnfsblock: set read/write tk_status to pnfs_error Peng Tao
2011-12-03 4:46 ` [PATCH 5/9] pnfsblock: remove rpc_call_ops from struct parallel_io Peng Tao
2011-12-03 4:46 ` Peng Tao [this message]
2011-12-03 4:46 ` [PATCH 7/9] pnfsblock: alloc short extent before submit bio Peng Tao
-- strict thread matches above, loose matches on Subject: below --
2012-01-09 16:02 [PATCH 0/9] pnfsblock: patches for 3.3 Peng Tao
2012-01-09 16:02 ` [PATCH 6/9] pnfsblock: clean up _add_entry Peng Tao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1322887583-2719-7-git-send-email-bergwolf@gmail.com \
--to=bergwolf@gmail.com \
--cc=Trond.Myklebust@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=peng_tao@emc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).