diff options
| author | David Howells <dhowells@redhat.com> | 2015-02-25 15:07:25 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2015-04-02 15:28:53 +0200 |
| commit | 73c04a47bf79770fbe7f3cf515f5831fccab88ee (patch) | |
| tree | c1356f4638ab71ae1f9490c2957b0e23d5e0de85 /fs | |
| parent | FS-Cache: Count the number of initialised operations (diff) | |
| download | linux-73c04a47bf79770fbe7f3cf515f5831fccab88ee.tar.xz linux-73c04a47bf79770fbe7f3cf515f5831fccab88ee.zip | |
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: David Howells <dhowells@redhat.com>
Reviewed-by: Steve Dickson <steved@redhat.com>
Acked-by: Jeff Layton <jeff.layton@primarydata.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fscache/operation.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c index 9761df4fc2ab..b6bf5f399d70 100644 --- a/fs/fscache/operation.c +++ b/fs/fscache/operation.c @@ -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); |