staging: lustre: use list_last_entry to simplify fld_cache_shrink

Using list_empty() and list_last_entry() makes the code clearer,
and allows a local variable to be discarded.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/fld/fld_cache.c b/drivers/staging/lustre/lustre/fld/fld_cache.c
index 7d6a7106c0a5030a856a6c870d668bb4e266374c..ecf8b9e1ed5c3f5332509190997adc9225391c45 100644 (file)
--- a/drivers/staging/lustre/lustre/fld/fld_cache.c
+++ b/drivers/staging/lustre/lustre/fld/fld_cache.c
@@ -213,19 +213,18 @@ static inline void fld_cache_entry_add(struct fld_cache *cache,
  */
 static int fld_cache_shrink(struct fld_cache *cache)
 {
-       struct fld_cache_entry *flde;
-       struct list_head *curr;
        int num = 0;
 
        if (cache->fci_cache_count < cache->fci_cache_size)
                return 0;
 
-       curr = cache->fci_lru.prev;
-
        while (cache->fci_cache_count + cache->fci_threshold >
-              cache->fci_cache_size && curr != &cache->fci_lru) {
-               flde = list_entry(curr, struct fld_cache_entry, fce_lru);
-               curr = curr->prev;
+              cache->fci_cache_size &&
+              !list_empty(&cache->fci_lru)) {
+               struct fld_cache_entry *flde =
+                       list_last_entry(&cache->fci_lru,
+                                       struct fld_cache_entry, fce_lru);
+
                fld_cache_entry_delete(cache, flde);
                num++;
        }