Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73c04a47 authored by David Howells's avatar David Howells
Browse files

FS-Cache: Fix cancellation of in-progress operation 



Cancellation of an in-progress operation needs to update the relevant counters
and start any operations that are pending waiting on this one.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarSteve Dickson <steved@redhat.com>
Acked-by: default avatarJeff Layton <jeff.layton@primarydata.com>
parent 03cdd0e4

fs/fscache/operation.c

+7 −0
Original line number Diff line number Diff line
@@ -365,6 +365,13 @@ int fscache_cancel_op(struct fscache_operation *op, 
			wake_up_bit(&op->flags, FSCACHE_OP_WAITING);

		ret = 0;

	} else if (op->state == FSCACHE_OP_ST_IN_PROGRESS && cancel_in_progress_op) {

		ASSERTCMP(object->n_in_progress, >, 0);

		if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))

			object->n_exclusive--;

		object->n_in_progress--;

		if (object->n_in_progress == 0)

			fscache_start_operations(object);



		fscache_stat(&fscache_n_op_cancelled);

		if (do_cancel)

			do_cancel(op);