diff options
| author | David Howells <dhowells@redhat.com> | 2013-05-10 20:50:26 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2013-06-19 15:16:47 +0200 |
| commit | 493f7bc11457bc1f6fbf25a4b2bdf215ebaf050f (patch) | |
| tree | a301ea64293effa2f31e5a1451ca740504f3f4e4 /fs/fscache/object.c | |
| parent | FS-Cache: Uninline fscache_object_init() (diff) | |
| download | linux-493f7bc11457bc1f6fbf25a4b2bdf215ebaf050f.tar.xz linux-493f7bc11457bc1f6fbf25a4b2bdf215ebaf050f.zip | |
FS-Cache: Wrap checks on object state
Wrap checks on object state (mostly outside of fs/fscache/object.c) with
inline functions so that the mechanism can be replaced.
Some of the state checks within object.c are left as-is as they will be
replaced.
Signed-off-by: David Howells <dhowells@redhat.com>
Tested-By: Milosz Tanski <milosz@adfin.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
Diffstat (limited to 'fs/fscache/object.c')
| -rw-r--r-- | fs/fscache/object.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/fscache/object.c b/fs/fscache/object.c index 0133699f74ee..863f6873c0f0 100644 --- a/fs/fscache/object.c +++ b/fs/fscache/object.c @@ -457,10 +457,10 @@ static void fscache_initialise_object(struct fscache_object *object) spin_lock_nested(&parent->lock, 1); _debug("parent %s", fscache_object_states[parent->state]); - if (parent->state >= FSCACHE_OBJECT_DYING) { + if (fscache_object_is_dying(parent)) { _debug("bad parent"); set_bit(FSCACHE_OBJECT_EV_WITHDRAW, &object->events); - } else if (parent->state < FSCACHE_OBJECT_AVAILABLE) { + } else if (!fscache_object_is_available(parent)) { _debug("wait"); /* we may get woken up in this state by child objects @@ -517,9 +517,9 @@ static void fscache_lookup_object(struct fscache_object *object) ASSERTCMP(parent->n_obj_ops, >, 0); /* make sure the parent is still available */ - ASSERTCMP(parent->state, >=, FSCACHE_OBJECT_AVAILABLE); + ASSERT(fscache_object_is_available(parent)); - if (parent->state >= FSCACHE_OBJECT_DYING || + if (fscache_object_is_dying(parent) || test_bit(FSCACHE_IOERROR, &object->cache->flags)) { _debug("unavailable"); set_bit(FSCACHE_OBJECT_EV_WITHDRAW, &object->events); |