Skip to contentSkip to conversation

shrinker API change fallout

PATCH In review Al Viro 2 participants 2 messages May 29, 2011 – May 30, 2011 UBI file system (UBIFS)

lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 1/1 shrinker API change fallout

commit 1495f230fa7750479c79e3656286b9183d662077 changed the API of ->shrink(), but missed ubifs and cifs instances.

Signed-off-by Al Viro <[email protected]>

---

fs/cifs/cifsacl.c +2 -1
index f3c6fb9..aaa01b8 100644
@@ -74,8 +74,9 @@ shrink_idmap_tree(struct rb_root *root, int nr_to_scan, int *nr_rem,
  * Run idmap cache shrinker.
  */
 static int
-cifs_idmap_shrinker(struct shrinker *shrink, int nr_to_scan, gfp_t gfp_mask)
+cifs_idmap_shrinker(struct shrinker *shrink, struct shrink_control *sc)
 {
+	int nr_to_scan = sc->nr_to_scan;
 	int nr_del = 0;
 	int nr_rem = 0;
 	struct rb_root *root;
fs/ubifs/shrinker.c +2 -1
index 46961c0..ca953a9 100644
@@ -277,8 +277,9 @@ static int kick_a_thread(void)
 	return 0;
 }
 
-int ubifs_shrinker(struct shrinker *shrink, int nr, gfp_t gfp_mask)
+int ubifs_shrinker(struct shrinker *shrink, struct shrink_control *sc)
 {
+	int nr = sc->nr_to_scan;
 	int freed, contention = 0;
 	long clean_zn_cnt = atomic_long_read(&ubifs_clean_zn_cnt);
fs/ubifs/ubifs.h +1 -1
index 93d1412..a70d7b4 100644
@@ -1614,7 +1614,7 @@ int ubifs_tnc_start_commit(struct ubifs_info *c, struct ubifs_zbranch *zroot);
 int ubifs_tnc_end_commit(struct ubifs_info *c);
 
 /* shrinker.c */
-int ubifs_shrinker(struct shrinker *shrink, int nr_to_scan, gfp_t gfp_mask);
+int ubifs_shrinker(struct shrinker *shrink, struct shrink_control *sc);
 
 /* commit.c */
 int ubifs_bg_thread(void *info);