From 733bd244ab1d03db5416b968500092977690a0be Mon Sep 17 00:00:00 2001 From: Li Xi Date: Sun, 22 Jun 2014 21:32:21 -0400 Subject: [PATCH] staging/lustre/llite: fix a flag bug of vvp_io_kernel_fault() After vvp_io_kernel_fault() locked the page, it should set VM_FAULT_LOCKED. Signed-off-by: Li Xi Reviewed-on: http://review.whamcloud.com/10740 Reviewed-by: Jinshan Xiong Reviewed-by: Emoly Liu Signed-off-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/llite/vvp_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/lustre/lustre/llite/vvp_io.c b/drivers/staging/lustre/lustre/llite/vvp_io.c index 04230edc1778..2539a89e4255 100644 --- a/drivers/staging/lustre/lustre/llite/vvp_io.c +++ b/drivers/staging/lustre/lustre/llite/vvp_io.c @@ -624,7 +624,7 @@ static int vvp_io_kernel_fault(struct vvp_fault_io *cfio) page_private(vmf->page), vmf->virtual_address); if (unlikely(!(cfio->fault.ft_flags & VM_FAULT_LOCKED))) { lock_page(vmf->page); - cfio->fault.ft_flags &= VM_FAULT_LOCKED; + cfio->fault.ft_flags |= VM_FAULT_LOCKED; } cfio->ft_vmpage = vmf->page; -- 2.25.1