From: Li Xi <lixi@ddn.com>
Date: Wed, 18 Jun 2014 02:24:42 +0000 (+0800)
Subject: LU-5220 llite: fix a flag bug of vvp_io_kernel_fault()
X-Git-Tag: 2.5.3~34
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=bf2e26c0d695a5ec6c6d1a0f6a978e4354ae8c5a;p=fs%2Flustre-release.git

LU-5220 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 <lixi@ddn.com>
Change-Id: Ic63f1b830360b127df6ae3220d63bef3ebf0b89c
Reviewed-on: http://review.whamcloud.com/10740
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Tested-by: Jenkins
Reviewed-by: Emoly Liu <emoly.liu@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c
index 7dfb28f..673c383 100644
--- a/lustre/llite/vvp_io.c
+++ b/lustre/llite/vvp_io.c
@@ -645,7 +645,7 @@ static int vvp_io_kernel_fault(struct vvp_fault_io *cfio)
                                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;