X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_page.c;h=125d02aeba1040a3482b7a86d1b4a549a290e4ae;hb=c06fc9da14b061aa4f1f3e652683eb648b02ae8e;hp=f543f59cc675abc1f79b318e025dd7cc5c2b645d;hpb=c33cd87b28122c8d059b4d05d373ae447348523e;p=fs%2Flustre-release.git diff --git a/lustre/llite/vvp_page.c b/lustre/llite/vvp_page.c index f543f59..125d02a 100644 --- a/lustre/llite/vvp_page.c +++ b/lustre/llite/vvp_page.c @@ -78,42 +78,34 @@ static void vvp_page_fini(const struct lu_env *env, vvp_page_fini_common(cp); } -static void vvp_page_own(const struct lu_env *env, - const struct cl_page_slice *slice, struct cl_io *_) +static int vvp_page_own(const struct lu_env *env, + const struct cl_page_slice *slice, struct cl_io *io, + int nonblock) { struct ccc_page *vpg = cl2ccc_page(slice); cfs_page_t *vmpage = vpg->cpg_page; - int count = 0; LASSERT(vmpage != NULL); + if (nonblock) { + if (TestSetPageLocked(vmpage)) + return -EAGAIN; - /* DEBUG CODE FOR #18881 */ - while (TestSetPageLocked(vmpage)) { - cfs_schedule_timeout(CFS_TASK_INTERRUPTIBLE, - cfs_time_seconds(1)/10); - if (++count > 600) { - CL_PAGE_DEBUG(D_ERROR, env, - cl_page_top(slice->cpl_page), - "XXX page %p blocked on acquiring the" - " lock. process %s/%p, flags %lx,io %p\n", - vmpage, current->comm, current, - vmpage->flags, _); - libcfs_debug_dumpstack(NULL); - LCONSOLE_WARN("Reproduced bug #18881,please contact:" - "jay , thanks\n"); - - lock_page(vmpage); - break; + if (unlikely(PageWriteback(vmpage))) { + unlock_page(vmpage); + return -EAGAIN; } + + return 0; } - /* DEBUG CODE END */ - /* lock_page(vmpage); */ + lock_page(vmpage); wait_on_page_writeback(vmpage); + return 0; } static void vvp_page_assume(const struct lu_env *env, - const struct cl_page_slice *slice, struct cl_io *_) + const struct cl_page_slice *slice, + struct cl_io *unused) { cfs_page_t *vmpage = cl2vm_page(slice); @@ -124,7 +116,7 @@ static void vvp_page_assume(const struct lu_env *env, static void vvp_page_unassume(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { cfs_page_t *vmpage = cl2vm_page(slice); @@ -144,7 +136,8 @@ static void vvp_page_disown(const struct lu_env *env, } static void vvp_page_discard(const struct lu_env *env, - const struct cl_page_slice *slice, struct cl_io *_) + const struct cl_page_slice *slice, + struct cl_io *unused) { cfs_page_t *vmpage = cl2vm_page(slice); struct address_space *mapping = vmpage->mapping; @@ -164,7 +157,8 @@ static void vvp_page_discard(const struct lu_env *env, } static int vvp_page_unmap(const struct lu_env *env, - const struct cl_page_slice *slice, struct cl_io *_) + const struct cl_page_slice *slice, + struct cl_io *unused) { cfs_page_t *vmpage = cl2vm_page(slice); __u64 offset = vmpage->index << CFS_PAGE_SHIFT; @@ -199,13 +193,17 @@ static void vvp_page_delete(const struct lu_env *env, } static void vvp_page_export(const struct lu_env *env, - const struct cl_page_slice *slice) + const struct cl_page_slice *slice, + int uptodate) { cfs_page_t *vmpage = cl2vm_page(slice); LASSERT(vmpage != NULL); LASSERT(PageLocked(vmpage)); - SetPageUptodate(vmpage); + if (uptodate) + SetPageUptodate(vmpage); + else + ClearPageUptodate(vmpage); } static int vvp_page_is_vmlocked(const struct lu_env *env, @@ -216,7 +214,7 @@ static int vvp_page_is_vmlocked(const struct lu_env *env, static int vvp_page_prep_read(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { ENTRY; /* Skip the page already marked as PG_uptodate. */ @@ -225,7 +223,7 @@ static int vvp_page_prep_read(const struct lu_env *env, static int vvp_page_prep_write(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { cfs_page_t *vmpage = cl2vm_page(slice); int result; @@ -264,14 +262,10 @@ static void vvp_page_completion_common(const struct lu_env *env, struct cl_page *clp = cp->cpg_cl.cpl_page; cfs_page_t *vmpage = cp->cpg_page; struct inode *inode = ccc_object_inode(clp->cp_obj); - struct cl_sync_io *anchor = cp->cpg_sync_io; LINVRNT(cl_page_is_vmlocked(env, clp)); - if (anchor != NULL) { - cp->cpg_sync_io = NULL; - cl_sync_io_note(anchor, ioret); - } else if (clp->cp_type == CPT_CACHEABLE) { + if (!clp->cp_sync_io && clp->cp_type == CPT_CACHEABLE) { /* * Only mark the page error only when it's a cacheable page * and NOT a sync io. @@ -302,7 +296,7 @@ static void vvp_page_completion_read(const struct lu_env *env, if (ioret == 0) { /* XXX: do we need this for transient pages? */ if (!cp->cpg_defer_uptodate) - cl_page_export(env, page); + cl_page_export(env, page, 1); } else cp->cpg_defer_uptodate = 0; vvp_page_completion_common(env, cp, ioret); @@ -456,37 +450,38 @@ static void vvp_transient_page_verify(const struct cl_page *page) /* LASSERT_SEM_LOCKED(&inode->i_alloc_sem); */ } -static void vvp_transient_page_own(const struct lu_env *env, - const struct cl_page_slice *slice, - struct cl_io *_) +static int vvp_transient_page_own(const struct lu_env *env, + const struct cl_page_slice *slice, + struct cl_io *unused, int nonblock) { vvp_transient_page_verify(slice->cpl_page); + return 0; } static void vvp_transient_page_assume(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { vvp_transient_page_verify(slice->cpl_page); } static void vvp_transient_page_unassume(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { vvp_transient_page_verify(slice->cpl_page); } static void vvp_transient_page_disown(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { vvp_transient_page_verify(slice->cpl_page); } static void vvp_transient_page_discard(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { struct cl_page *page = slice->cpl_page;