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

Commit d0eb06af authored by Kiran Kumar Modukuri's avatar Kiran Kumar Modukuri Committed by David Howells
Browse files

fscache: Allow cancelled operations to be enqueued 



Alter the state-check assertion in fscache_enqueue_operation() to allow
cancelled operations to be given processing time so they can be cleaned up.

Also fix a debugging statement that was requiring such operations to have
an object assigned.

Fixes: 9ae326a6 ("CacheFiles: A cache that backs onto a mounted filesystem")
Reported-by: default avatarKiran Kumar Modukuri <kiran.modukuri@gmail.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent fc36def9

fs/fscache/operation.c

+4 −2
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ void fscache_enqueue_operation(struct fscache_operation *op) 
	ASSERT(op->processor != NULL);

	ASSERT(fscache_object_is_available(op->object));

	ASSERTCMP(atomic_read(&op->usage), >, 0);

	ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);

	ASSERTIFCMP(op->state != FSCACHE_OP_ST_IN_PROGRESS,

		    op->state, ==,  FSCACHE_OP_ST_CANCELLED);



	fscache_stat(&fscache_n_op_enqueue);

	switch (op->flags & FSCACHE_OP_TYPE) {
@@ -499,7 +500,8 @@ void fscache_put_operation(struct fscache_operation *op) 
	struct fscache_cache *cache;



	_enter("{OBJ%x OP%x,%d}",

	       op->object->debug_id, op->debug_id, atomic_read(&op->usage));

	       op->object ? op->object->debug_id : 0,

	       op->debug_id, atomic_read(&op->usage));



	ASSERTCMP(atomic_read(&op->usage), >, 0);