Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef1d5759 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

cifs/ubifs: Fix shrinker API change fallout 



Commit 1495f230 ("vmscan: change shrinker API by passing
shrink_control struct") changed the API of ->shrink(), but missed ubifs
and cifs instances.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bc658c96

fs/cifs/cifsacl.c

+2 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);