Commit 91196c20 authored by Jinshan Xiong's avatar Jinshan Xiong Committed by Greg Kroah-Hartman

staging: lustre: llite: avoid a deadlock in page write

For a partial page write, it will have to issue a READ RPC firstly
to get a full uptodate page. If another page is already locked by
this thread it can easily cause deadlock.
Signed-off-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4873
Reviewed-on: http://review.whamcloud.com/9928Reviewed-by: default avatarBobi Jam <bobijam@gmail.com>
Reviewed-by: default avatarNiu Yawei <yawei.niu@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9b58714f
...@@ -506,8 +506,9 @@ static int ll_write_begin(struct file *file, struct address_space *mapping, ...@@ -506,8 +506,9 @@ static int ll_write_begin(struct file *file, struct address_space *mapping,
env = lcc->lcc_env; env = lcc->lcc_env;
io = lcc->lcc_io; io = lcc->lcc_io;
/* To avoid deadlock, try to lock page first. */ if (likely(to == PAGE_SIZE)) /* LU-4873 */
vmpage = grab_cache_page_nowait(mapping, index); /* To avoid deadlock, try to lock page first. */
vmpage = grab_cache_page_nowait(mapping, index);
if (unlikely(!vmpage || PageDirty(vmpage) || PageWriteback(vmpage))) { if (unlikely(!vmpage || PageDirty(vmpage) || PageWriteback(vmpage))) {
struct vvp_io *vio = vvp_env_io(env); struct vvp_io *vio = vvp_env_io(env);
struct cl_page_list *plist = &vio->u.write.vui_queue; struct cl_page_list *plist = &vio->u.write.vui_queue;
......
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