Skip to content

Commit

Permalink
fuse: Get rid of bdi_initialized
Browse files Browse the repository at this point in the history
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: Miklos Szeredi <mszeredi@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
  • Loading branch information
jankara authored and axboe committed Apr 20, 2017
1 parent 5f7f754 commit 7fbbe97
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
5 changes: 2 additions & 3 deletions fs/fuse/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down
3 changes: 0 additions & 3 deletions fs/fuse/fuse_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions fs/fuse/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 7fbbe97

Please sign in to comment.