Commit ce248d59 authored by Andriy Skulysh's avatar Andriy Skulysh Committed by Greg Kroah-Hartman
Browse files

staging/lustre/osc: osc_extent_truncate()) ASSERTION( !ext->oe_urgent ) failed 



The bug was caused by race between truncate & fsync.
osc_extent_wait() doesn't takes into account oe_trunc_pending
during setting oe_urgent. The race arises after
osc_object_unlock().
osc_extent_wait() should ignore extents with oe_trunc_pending
while waiting for OES_INV. osc_cache_truncate_end() will set
oe_urgent and call osc_io_unplug_async()

Signed-off-by: default avatarAndriy Skulysh <Andriy_Skulysh@xyratex.com>
Reviewed-on: http://review.whamcloud.com/10204
Xyratex-bug-id: LELUS-239
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4852


Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88fa62b2

drivers/staging/lustre/lustre/osc/osc_cache.c

+4 −3
Original line number Diff line number Diff line
@@ -871,7 +871,8 @@ static int osc_extent_wait(const struct lu_env *env, struct osc_extent *ext, 
	LASSERT(sanity_check_nolock(ext) == 0);

	/* `Kick' this extent only if the caller is waiting for it to be

	 * written out. */

	if (state == OES_INV && !ext->oe_urgent && !ext->oe_hp) {

	if (state == OES_INV && !ext->oe_urgent && !ext->oe_hp &&

	    !ext->oe_trunc_pending) {

		if (ext->oe_state == OES_ACTIVE) {

			ext->oe_urgent = 1;

		} else if (ext->oe_state == OES_CACHE) {
@@ -922,8 +923,8 @@ static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index, 
	int		    rc       = 0;



	LASSERT(sanity_check(ext) == 0);

	LASSERT(ext->oe_state == OES_TRUNC);

	LASSERT(!ext->oe_urgent);

	EASSERT(ext->oe_state == OES_TRUNC, ext);

	EASSERT(!ext->oe_urgent, ext);



	/* Request new lu_env.

	 * We can't use that env from osc_cache_truncate_start() because