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

Commit 92738aab authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

fs: explicitly unregister per-superblock BDIs 

[ Upstream commit 0b3ea0926afb8dde70cfab00316ae0a70b93a7cc ]

Add a new SB_I_ flag to mark superblocks that have an ephemeral bdi
associated with them, and unregister it when the superblock is shut
down.

Link: https://lkml.kernel.org/r/20211021124441.668816-4-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Stable-dep-of: 4bcda1eaf184 ("mount: handle OOM on mnt_warn_timestamp_expiry")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8f888123

fs/super.c

+3 −0
Original line number Diff line number Diff line
@@ -475,6 +475,8 @@ void generic_shutdown_super(struct super_block *sb) 
	spin_unlock(&sb_lock);

	up_write(&sb->s_umount);

	if (sb->s_bdi != &noop_backing_dev_info) {

		if (sb->s_iflags & SB_I_PERSB_BDI)

			bdi_unregister(sb->s_bdi);

		bdi_put(sb->s_bdi);

		sb->s_bdi = &noop_backing_dev_info;

	}
@@ -1622,6 +1624,7 @@ int super_setup_bdi_name(struct super_block *sb, char *fmt, ...) 
	}

	WARN_ON(sb->s_bdi != &noop_backing_dev_info);

	sb->s_bdi = bdi;

	sb->s_iflags |= SB_I_PERSB_BDI;



	return 0;

}

include/linux/fs.h

+1 −0
Original line number Diff line number Diff line
@@ -1407,6 +1407,7 @@ extern int send_sigurg(struct fown_struct *fown); 
#define SB_I_UNTRUSTED_MOUNTER		0x00000040



#define SB_I_SKIP_SYNC	0x00000100	/* Skip superblock at global sync */

#define SB_I_PERSB_BDI	0x00000200	/* has a per-sb bdi */



/* Possible states of 'frozen' field */

enum {