FS-Cache: Permit fscache_cancel_op() to cancel in-progress operations too

[firefly-linux-kernel-4.4.55.git] / fs / fscache / page.c

diff --git a/fs/fscache/page.c b/fs/fscache/page.c
index d0805e31361cb9328714440cccc3f4e3f908cbce..433cae927eca6d0b926c6694908e15d6ba2ff13d 100644 (file)
--- a/fs/fscache/page.c
+++ b/fs/fscache/page.c
@@ -359,7 +359,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
                fscache_stat(stat_op_waits);
        if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
                        TASK_INTERRUPTIBLE) != 0) {
-               ret = fscache_cancel_op(op, do_cancel);
+               ret = fscache_cancel_op(op, do_cancel, false);
                if (ret == 0)
                        return -ERESTARTSYS;
 
@@ -380,7 +380,7 @@ check_if_dead:
        if (unlikely(fscache_object_is_dying(object) ||
                     fscache_cache_is_broken(object))) {
                enum fscache_operation_state state = op->state;
-               fscache_cancel_op(op, do_cancel);
+               fscache_cancel_op(op, do_cancel, true);
                if (stat_object_dead)
                        fscache_stat(stat_object_dead);
                _leave(" = -ENOBUFS [obj dead %d]", state);