summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2015-02-24 10:52:51 +0000
committerDavid Howells <dhowells@redhat.com>2015-04-02 14:28:53 +0100
commit87021526300f1a292dd966e141e183630ac95317 (patch)
treea248e5643ecdf9dae6ab6a2fe0e3d4abc415b373 /include
parentf09b443d0e09f37121c55d7f83056f6ebff6ab4f (diff)
downloadlinux-87021526300f1a292dd966e141e183630ac95317.tar.gz
linux-87021526300f1a292dd966e141e183630ac95317.tar.bz2
linux-87021526300f1a292dd966e141e183630ac95317.zip
FS-Cache: fscache_object_is_dead() has wrong logic, kill it
fscache_object_is_dead() returns true only if the object is marked dead and the cache got an I/O error. This should be a logical OR instead. Since two of the callers got split up into handling for separate subcases, expand the other callers and kill the function. This is probably the right thing to do anyway since one of the subcases isn't about the object at all, but rather about the cache. 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 'include')
-rw-r--r--include/linux/fscache-cache.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
index 2e83a141e465..ca3d550da11e 100644
--- a/include/linux/fscache-cache.h
+++ b/include/linux/fscache-cache.h
@@ -423,12 +423,6 @@ static inline bool fscache_object_is_active(struct fscache_object *object)
!fscache_cache_is_broken(object);
}
-static inline bool fscache_object_is_dead(struct fscache_object *object)
-{
- return fscache_object_is_dying(object) &&
- fscache_cache_is_broken(object);
-}
-
/**
* fscache_object_destroyed - Note destruction of an object in a cache
* @cache: The cache from which the object came