Merge by hand (conflicts in sd.c)

[sfrench/cifs-2.6.git] / fs / mbcache.c

diff --git a/fs/mbcache.c b/fs/mbcache.c
index c7170b9221a306a0b024c29f7e2599957edc73ce..b002a088857da50e26efcfc72d8f76e0d0b8379c 100644 (file)
--- a/fs/mbcache.c
+++ b/fs/mbcache.c
@@ -316,11 +316,10 @@ fail:
  * currently in use cannot be freed, and thus remain in the cache. All others
  * are freed.
  *
- * @cache: which cache to shrink
  * @bdev: which device's cache entries to shrink
  */
 void
-mb_cache_shrink(struct mb_cache *cache, struct block_device *bdev)
+mb_cache_shrink(struct block_device *bdev)
 {
        LIST_HEAD(free_list);
        struct list_head *l, *ltmp;