Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
cifs/ubifs: Fix shrinker API change fallout
Commit 1495f230fa77 ("vmscan: change shrinker API by passing
shrink_control struct") changed the API of ->shrink(), but missed ubifs
and cifs instances.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Al Viro
and committed by
Linus Torvalds
ef1d5759
bc658c96
+5
-3
+2
-1
fs/cifs/cifsacl.c
+2
-1
fs/cifs/cifsacl.c
···
74
74
* Run idmap cache shrinker.
75
75
*/
76
76
static int
77
-
cifs_idmap_shrinker(struct shrinker *shrink, int nr_to_scan, gfp_t gfp_mask)
77
+
cifs_idmap_shrinker(struct shrinker *shrink, struct shrink_control *sc)
78
78
{
79
+
int nr_to_scan = sc->nr_to_scan;
79
80
int nr_del = 0;
80
81
int nr_rem = 0;
81
82
struct rb_root *root;
+2
-1
fs/ubifs/shrinker.c
+2
-1
fs/ubifs/shrinker.c
···
277
277
return 0;
278
278
}
279
279
280
-
int ubifs_shrinker(struct shrinker *shrink, int nr, gfp_t gfp_mask)
280
+
int ubifs_shrinker(struct shrinker *shrink, struct shrink_control *sc)
281
281
{
282
+
int nr = sc->nr_to_scan;
282
283
int freed, contention = 0;
283
284
long clean_zn_cnt = atomic_long_read(&ubifs_clean_zn_cnt);
284
285
+1
-1
fs/ubifs/ubifs.h
+1
-1
fs/ubifs/ubifs.h
···
1614
1614
int ubifs_tnc_end_commit(struct ubifs_info *c);
1615
1615
1616
1616
/* shrinker.c */
1617
-
int ubifs_shrinker(struct shrinker *shrink, int nr_to_scan, gfp_t gfp_mask);
1617
+
int ubifs_shrinker(struct shrinker *shrink, struct shrink_control *sc);
1618
1618
1619
1619
/* commit.c */
1620
1620
int ubifs_bg_thread(void *info);