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

Commit 7fbbe972 authored by Jan Kara's avatar Jan Kara Committed by Jens Axboe
Browse files

fuse: Get rid of bdi_initialized 



It is not needed anymore since bdi is initialized whenever superblock
exists.

CC: Miklos Szeredi <miklos@szeredi.hu>
CC: linux-fsdevel@vger.kernel.org
Suggested-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 5f7f7543

fs/fuse/dev.c

+2 −3
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req) 
			wake_up(&fc->blocked_waitq);



		if (fc->num_background == fc->congestion_threshold &&

		    fc->connected && fc->bdi_initialized) {

		    fc->connected && fc->sb) {

			clear_bdi_congested(fc->sb->s_bdi, BLK_RW_SYNC);

			clear_bdi_congested(fc->sb->s_bdi, BLK_RW_ASYNC);

		}
@@ -573,8 +573,7 @@ void fuse_request_send_background_locked(struct fuse_conn *fc, 
	fc->num_background++;

	if (fc->num_background == fc->max_background)

		fc->blocked = 1;

	if (fc->num_background == fc->congestion_threshold &&

	    fc->bdi_initialized) {

	if (fc->num_background == fc->congestion_threshold && fc->sb) {

		set_bdi_congested(fc->sb->s_bdi, BLK_RW_SYNC);

		set_bdi_congested(fc->sb->s_bdi, BLK_RW_ASYNC);

	}

fs/fuse/fuse_i.h

+0 −3
Original line number Diff line number Diff line
@@ -527,9 +527,6 @@ struct fuse_conn { 
	/** Filesystem supports NFS exporting.  Only set in INIT */

	unsigned export_support:1;



	/** Set if bdi is valid */

	unsigned bdi_initialized:1;



	/** write-back cache policy (default is write-through) */

	unsigned writeback_cache:1;

fs/fuse/inode.c

+0 −2
Original line number Diff line number Diff line
@@ -983,8 +983,6 @@ static int fuse_bdi_init(struct fuse_conn *fc, struct super_block *sb) 
	/* fuse does it's own writeback accounting */

	sb->s_bdi->capabilities = BDI_CAP_NO_ACCT_WB | BDI_CAP_STRICTLIMIT;



	fc->bdi_initialized = 1;



	/*

	 * For a single fuse filesystem use max 1% of dirty +

	 * writeback threshold.