From: Jan Kara <jack@suse.cz>
To: Jens Axboe <axboe@kernel.dk>
Cc: <linux-block@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>,
Jan Kara <jack@suse.cz>, Miklos Szeredi <miklos@szeredi.hu>
Subject: [PATCH 17/25] fuse: Get rid of bdi_initialized
Date: Wed, 12 Apr 2017 12:24:41 +0200 [thread overview]
Message-ID: <20170412102449.16901-18-jack@suse.cz> (raw)
In-Reply-To: <20170412102449.16901-1-jack@suse.cz>
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>
---
fs/fuse/dev.c | 5 ++---
fs/fuse/fuse_i.h | 3 ---
fs/fuse/inode.c | 2 --
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 78887f68ee6a..c2d7f3a92679 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -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);
}
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index 0e7c79a390e0..f33341d9501a 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -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;
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 90bacbc87fb3..73cf05135252 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -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.
--
2.12.0
next prev parent reply other threads:[~2017-04-12 10:24 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-12 10:24 [PATCH 0/25 v3] fs: Convert all embedded bdis into separate ones Jan Kara
2017-04-12 10:24 ` [PATCH 01/25] bdi: Provide bdi_register_va() and bdi_alloc() Jan Kara
2017-04-12 10:24 ` [PATCH 02/25] block: Unregister bdi on last reference drop Jan Kara
2017-04-12 10:24 ` [PATCH 03/25] bdi: Export bdi_alloc_node() and bdi_put() Jan Kara
2017-04-12 10:24 ` [PATCH 04/25] fs: Provide infrastructure for dynamic BDIs in filesystems Jan Kara
2017-04-12 10:24 ` [PATCH 05/25] fs: Get proper reference for s_bdi Jan Kara
2017-04-12 10:24 ` [PATCH 06/25] lustre: Convert to separately allocated bdi Jan Kara
2017-04-12 10:24 ` [PATCH 07/25] 9p: " Jan Kara
2017-04-12 10:24 ` [PATCH 08/25] btrfs: " Jan Kara
2017-04-12 10:24 ` [PATCH 09/25] ceph: " Jan Kara
2017-04-12 10:24 ` [PATCH 10/25] cifs: " Jan Kara
2017-04-12 10:24 ` [PATCH 11/25] ecryptfs: " Jan Kara
2017-04-12 10:24 ` [PATCH 12/25] afs: " Jan Kara
2017-04-12 10:24 ` [PATCH 13/25] mtd: Convert to dynamically allocated bdi infrastructure Jan Kara
2017-04-12 10:24 ` [PATCH 14/25] coda: Convert to separately allocated bdi Jan Kara
2017-04-12 10:24 ` [PATCH 15/25] exofs: " Jan Kara
2017-04-12 10:24 ` [PATCH 16/25] fuse: " Jan Kara
2017-05-15 20:34 ` Rakesh Pandit
2017-05-16 10:48 ` Jan Kara
2017-05-16 18:37 ` Rakesh Pandit
2017-05-16 23:24 ` Jens Axboe
2017-05-17 7:46 ` Jan Kara
2017-05-17 14:15 ` Jens Axboe
2017-04-12 10:24 ` Jan Kara [this message]
2017-04-12 10:24 ` [PATCH 18/25] gfs2: Convert to properly refcounting bdi Jan Kara
2017-04-12 10:24 ` [PATCH 19/25] nilfs2: " Jan Kara
2017-04-12 13:47 ` Ryusuke Konishi
2017-04-12 10:24 ` [PATCH 20/25] ncpfs: Convert to separately allocated bdi Jan Kara
2017-04-12 10:24 ` [PATCH 21/25] nfs: " Jan Kara
2017-04-20 18:06 ` Trond Myklebust
2017-04-12 10:24 ` [PATCH 22/25] ubifs: " Jan Kara
2017-04-12 10:24 ` [PATCH 23/25] fs: Remove SB_I_DYNBDI flag Jan Kara
2017-04-12 10:24 ` [PATCH 24/25] block: Remove unused functions Jan Kara
2017-04-12 10:24 ` [PATCH 25/25] bdi: Drop 'parent' argument from bdi_register[_va]() Jan Kara
2017-04-20 18:11 ` [PATCH 0/25 v3] fs: Convert all embedded bdis into separate ones Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2017-03-29 10:55 [PATCH 0/25 v2] " Jan Kara
2017-03-29 10:56 ` [PATCH 17/25] fuse: Get rid of bdi_initialized Jan Kara
2017-04-12 8:15 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170412102449.16901-18-jack@suse.cz \
--to=jack@suse.cz \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=miklos@szeredi.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).