LU-394: LND failure casued by discontiguous KIOV

[fs/lustre-release.git] / lustre / osc / osc_lock.c

diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c
index 0b03ea7..6991275 100644 (file)
--- a/lustre/osc/osc_lock.c
+++ b/lustre/osc/osc_lock.c
@@ -1313,7 +1313,7 @@ static void osc_lock_cancel(const struct lu_env *env,
         if (dlmlock != NULL) {
                 int do_cancel;
 
-                discard = dlmlock->l_flags & LDLM_FL_DISCARD_DATA;
+                discard = !!(dlmlock->l_flags & LDLM_FL_DISCARD_DATA);
                 result = osc_lock_flush(olck, discard);
                 osc_lock_unhold(olck);
 
@@ -1374,8 +1374,7 @@ static int osc_lock_has_pages(struct osc_lock *olck)
                 io->ci_obj = cl_object_top(obj);
                 cl_io_init(env, io, CIT_MISC, io->ci_obj);
                 cl_page_gang_lookup(env, obj, io,
-                                    descr->cld_start, descr->cld_end, plist, 0,
-                                    NULL);
+                                    descr->cld_start, descr->cld_end, plist);
                 cl_lock_page_list_fixup(env, io, lock, plist);
                 if (plist->pl_nr > 0) {
                         CL_LOCK_DEBUG(D_ERROR, env, lock, "still has pages\n");