diff options
| author | David Howells <dhowells@redhat.com> | 2013-05-10 19:50:26 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2013-06-19 14:16:47 +0100 |
| commit | 493f7bc11457bc1f6fbf25a4b2bdf215ebaf050f (patch) | |
| tree | a301ea64293effa2f31e5a1451ca740504f3f4e4 /fs/cachefiles/namei.c | |
| parent | 610be24ee434aa89197f06f30fef02be83c006a5 (diff) | |
| download | op-kernel-dev-493f7bc11457bc1f6fbf25a4b2bdf215ebaf050f.zip op-kernel-dev-493f7bc11457bc1f6fbf25a4b2bdf215ebaf050f.tar.gz | |
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/cachefiles/namei.c')
| -rw-r--r-- | fs/cachefiles/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c index 07cbd44..01979a3 100644 --- a/fs/cachefiles/namei.c +++ b/fs/cachefiles/namei.c @@ -130,7 +130,7 @@ found_dentry: fscache_object_states[object->fscache.state], dentry); - if (object->fscache.state < FSCACHE_OBJECT_DYING) { + if (fscache_object_is_live(&object->fscache)) { printk(KERN_ERR "\n"); printk(KERN_ERR "CacheFiles: Error:" " Can't preemptively bury live object\n"); @@ -192,7 +192,7 @@ try_again: /* an old object from a previous incarnation is hogging the slot - we * need to wait for it to be destroyed */ wait_for_old_object: - if (xobject->fscache.state < FSCACHE_OBJECT_DYING) { + if (fscache_object_is_live(&object->fscache)) { printk(KERN_ERR "\n"); printk(KERN_ERR "CacheFiles: Error:" " Unexpected object collision\n"); |
