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>, Steve French <sfrench@samba.org>,
linux-cifs@vger.kernel.org
Subject: [PATCH 10/25] cifs: Convert to separately allocated bdi
Date: Wed, 12 Apr 2017 12:24:34 +0200 [thread overview]
Message-ID: <20170412102449.16901-11-jack@suse.cz> (raw)
In-Reply-To: <20170412102449.16901-1-jack@suse.cz>
Allocate struct backing_dev_info separately instead of embedding it
inside superblock. This unifies handling of bdi among users.
CC: Steve French <sfrench@samba.org>
CC: linux-cifs@vger.kernel.org
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/cifs/cifs_fs_sb.h | 1 -
fs/cifs/cifsfs.c | 7 ++++++-
fs/cifs/connect.c | 10 ----------
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
index 07ed81cf1552..cbd216b57239 100644
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@ -68,7 +68,6 @@ struct cifs_sb_info {
umode_t mnt_dir_mode;
unsigned int mnt_cifs_flags;
char *mountdata; /* options received at mount time or via DFS refs */
- struct backing_dev_info bdi;
struct delayed_work prune_tlinks;
struct rcu_head rcu;
char *prepath;
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 15e1db8738ae..502eab6bdbc4 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -138,7 +138,12 @@ cifs_read_super(struct super_block *sb)
sb->s_magic = CIFS_MAGIC_NUMBER;
sb->s_op = &cifs_super_ops;
sb->s_xattr = cifs_xattr_handlers;
- sb->s_bdi = &cifs_sb->bdi;
+ rc = super_setup_bdi(sb);
+ if (rc)
+ goto out_no_root;
+ /* tune readahead according to rsize */
+ sb->s_bdi->ra_pages = cifs_sb->rsize / PAGE_SIZE;
+
sb->s_blocksize = CIFS_MAX_MSGSIZE;
sb->s_blocksize_bits = 14; /* default 2**14 = CIFS_MAX_MSGSIZE */
inode = cifs_root_iget(sb);
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 9ae695ae3ed7..7f50c8949401 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -3683,10 +3683,6 @@ cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *volume_info)
int referral_walks_count = 0;
#endif
- rc = bdi_setup_and_register(&cifs_sb->bdi, "cifs");
- if (rc)
- return rc;
-
#ifdef CONFIG_CIFS_DFS_UPCALL
try_mount_again:
/* cleanup activities if we're chasing a referral */
@@ -3714,7 +3710,6 @@ cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *volume_info)
server = cifs_get_tcp_session(volume_info);
if (IS_ERR(server)) {
rc = PTR_ERR(server);
- bdi_destroy(&cifs_sb->bdi);
goto out;
}
if ((volume_info->max_credits < 20) ||
@@ -3768,9 +3763,6 @@ cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *volume_info)
cifs_sb->wsize = server->ops->negotiate_wsize(tcon, volume_info);
cifs_sb->rsize = server->ops->negotiate_rsize(tcon, volume_info);
- /* tune readahead according to rsize */
- cifs_sb->bdi.ra_pages = cifs_sb->rsize / PAGE_SIZE;
-
remote_path_check:
#ifdef CONFIG_CIFS_DFS_UPCALL
/*
@@ -3887,7 +3879,6 @@ cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *volume_info)
cifs_put_smb_ses(ses);
else
cifs_put_tcp_session(server, 0);
- bdi_destroy(&cifs_sb->bdi);
}
out:
@@ -4090,7 +4081,6 @@ cifs_umount(struct cifs_sb_info *cifs_sb)
}
spin_unlock(&cifs_sb->tlink_tree_lock);
- bdi_destroy(&cifs_sb->bdi);
kfree(cifs_sb->mountdata);
kfree(cifs_sb->prepath);
call_rcu(&cifs_sb->rcu, delayed_free);
--
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 ` Jan Kara [this message]
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 ` [PATCH 17/25] fuse: Get rid of bdi_initialized Jan Kara
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 10/25] cifs: Convert to separately allocated bdi Jan Kara
2017-04-12 8:11 ` 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-11-jack@suse.cz \
--to=jack@suse.cz \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=sfrench@samba.org \
/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).