diff options
| author | NeilBrown <neilb@suse.de> | 2010-08-10 10:02:33 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-08-10 10:02:33 +1000 |
| commit | fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d (patch) | |
| tree | 311567d03758afc3a93b4273fe172836e89bb01d /fs/inode.c | |
| parent | 6e17b0276452912cb13445e5ea552b599984675f (diff) | |
| parent | 2144381da478cc4aa3a29ee29b0c5e6ddaaced14 (diff) | |
| download | kernel_replicant_linux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.tar.gz kernel_replicant_linux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.tar.bz2 kernel_replicant_linux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.zip | |
Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c index 2bee20ae3d65..722860b323a9 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -512,7 +512,7 @@ static void prune_icache(int nr_to_scan) * This function is passed the number of inodes to scan, and it returns the * total number of remaining possibly-reclaimable inodes. */ -static int shrink_icache_memory(int nr, gfp_t gfp_mask) +static int shrink_icache_memory(struct shrinker *shrink, int nr, gfp_t gfp_mask) { if (nr) { /* |