diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /fs/fscache | |
parent | c506653d35249bb4738bb139c24362e1ae724bc1 (diff) | |
parent | ec30f343d61391ab23705e50a525da1d55395780 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/fscache')
-rw-r--r-- | fs/fscache/operation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c index b9f34eaede09..48a18f184d50 100644 --- a/fs/fscache/operation.c +++ b/fs/fscache/operation.c | |||
@@ -101,7 +101,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object, | |||
101 | object->n_ops++; | 101 | object->n_ops++; |
102 | object->n_exclusive++; /* reads and writes must wait */ | 102 | object->n_exclusive++; /* reads and writes must wait */ |
103 | 103 | ||
104 | if (object->n_ops > 0) { | 104 | if (object->n_ops > 1) { |
105 | atomic_inc(&op->usage); | 105 | atomic_inc(&op->usage); |
106 | list_add_tail(&op->pend_link, &object->pending_ops); | 106 | list_add_tail(&op->pend_link, &object->pending_ops); |
107 | fscache_stat(&fscache_n_op_pend); | 107 | fscache_stat(&fscache_n_op_pend); |