Commit aac2e54f authored by Lai Siyao's avatar Lai Siyao Committed by Greg Kroah-Hartman

staging/lustre/llite: avoid nonatomic memory alloc under spinlock

ll_intent_drop_lock() may sleep in memory allocation, which
should not be called inside spinlock.
Signed-off-by: default avatarLai Siyao <lai.siyao@intel.com>
Signed-off-by: default avatarJian Yu <jian.yu@intel.com>
Reviewed-on: http://review.whamcloud.com/10674
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2272Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4a316f79
...@@ -706,11 +706,21 @@ static int ll_statahead_interpret(struct ptlrpc_request *req, ...@@ -706,11 +706,21 @@ static int ll_statahead_interpret(struct ptlrpc_request *req,
struct ll_inode_info *lli = ll_i2info(dir); struct ll_inode_info *lli = ll_i2info(dir);
struct ll_statahead_info *sai = NULL; struct ll_statahead_info *sai = NULL;
struct ll_sa_entry *entry; struct ll_sa_entry *entry;
__u64 handle = 0;
int wakeup; int wakeup;
if (it_disposition(it, DISP_LOOKUP_NEG)) if (it_disposition(it, DISP_LOOKUP_NEG))
rc = -ENOENT; rc = -ENOENT;
if (rc == 0) {
/* release ibits lock ASAP to avoid deadlock when statahead
* thread enqueues lock on parent in readdir and another
* process enqueues lock on child with parent lock held, eg.
* unlink. */
handle = it->d.lustre.it_lock_handle;
ll_intent_drop_lock(it);
}
spin_lock(&lli->lli_sa_lock); spin_lock(&lli->lli_sa_lock);
/* stale entry */ /* stale entry */
if (unlikely(lli->lli_sai == NULL || if (unlikely(lli->lli_sai == NULL ||
...@@ -745,8 +755,7 @@ static int ll_statahead_interpret(struct ptlrpc_request *req, ...@@ -745,8 +755,7 @@ static int ll_statahead_interpret(struct ptlrpc_request *req,
* when statahead thread tries to enqueue lock on parent * when statahead thread tries to enqueue lock on parent
* for readpage and other tries to enqueue lock on child * for readpage and other tries to enqueue lock on child
* with parent's lock held, for example: unlink. */ * with parent's lock held, for example: unlink. */
entry->se_handle = it->d.lustre.it_lock_handle; entry->se_handle = handle;
ll_intent_drop_lock(it);
wakeup = sa_received_empty(sai); wakeup = sa_received_empty(sai);
list_add_tail(&entry->se_list, list_add_tail(&entry->se_list,
&sai->sai_entries_received); &sai->sai_entries_received);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment