Commit 2678da88 authored by Xiubo Li's avatar Xiubo Li Committed by Ilya Dryomov
Browse files

ceph: add ceph_sb_to_mdsc helper support to parse the mdsc 



This will help simplify the code.

[ jlayton: fix minor merge conflict in quota.c ]

Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent c5f575ed

fs/ceph/caps.c

+1 −2
Original line number Diff line number Diff line
@@ -1906,9 +1906,8 @@ bool __ceph_should_report_size(struct ceph_inode_info *ci) 
void ceph_check_caps(struct ceph_inode_info *ci, int flags,

		     struct ceph_mds_session *session)

{

	struct ceph_fs_client *fsc = ceph_inode_to_client(&ci->vfs_inode);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct inode *inode = &ci->vfs_inode;

	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(inode->i_sb);

	struct ceph_cap *cap;

	u64 flush_tid, oldest_flush_tid;

	int file_wanted, used, cap_used;

fs/ceph/dir.c

+7 −13
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ static int __dir_lease_try_check(const struct dentry *dentry); 
static int ceph_d_init(struct dentry *dentry)

{

	struct ceph_dentry_info *di;

	struct ceph_fs_client *fsc = ceph_sb_to_client(dentry->d_sb);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(dentry->d_sb);



	di = kmem_cache_zalloc(ceph_dentry_cachep, GFP_KERNEL);

	if (!di)
@@ -738,7 +737,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry, 
				  unsigned int flags)

{

	struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(dir->i_sb);

	struct ceph_mds_request *req;

	int op;

	int mask;
@@ -827,8 +826,7 @@ int ceph_handle_notrace_create(struct inode *dir, struct dentry *dentry) 
static int ceph_mknod(struct inode *dir, struct dentry *dentry,

		      umode_t mode, dev_t rdev)

{

	struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(dir->i_sb);

	struct ceph_mds_request *req;

	struct ceph_acl_sec_ctx as_ctx = {};

	int err;
@@ -889,8 +887,7 @@ static int ceph_create(struct inode *dir, struct dentry *dentry, umode_t mode, 
static int ceph_symlink(struct inode *dir, struct dentry *dentry,

			    const char *dest)

{

	struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(dir->i_sb);

	struct ceph_mds_request *req;

	struct ceph_acl_sec_ctx as_ctx = {};

	int err;
@@ -942,8 +939,7 @@ static int ceph_symlink(struct inode *dir, struct dentry *dentry, 


static int ceph_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)

{

	struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(dir->i_sb);

	struct ceph_mds_request *req;

	struct ceph_acl_sec_ctx as_ctx = {};

	int err = -EROFS;
@@ -1010,8 +1006,7 @@ static int ceph_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 
static int ceph_link(struct dentry *old_dentry, struct inode *dir,

		     struct dentry *dentry)

{

	struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(dir->i_sb);

	struct ceph_mds_request *req;

	int err;
@@ -1192,8 +1187,7 @@ static int ceph_rename(struct inode *old_dir, struct dentry *old_dentry, 
		       struct inode *new_dir, struct dentry *new_dentry,

		       unsigned int flags)

{

	struct ceph_fs_client *fsc = ceph_sb_to_client(old_dir->i_sb);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(old_dir->i_sb);

	struct ceph_mds_request *req;

	int op = CEPH_MDS_OP_RENAME;

	int err;

fs/ceph/file.c

+3 −5
Original line number Diff line number Diff line
@@ -182,8 +182,7 @@ static void put_bvecs(struct bio_vec *bvecs, int num_bvecs, bool should_dirty) 
static struct ceph_mds_request *

prepare_open_request(struct super_block *sb, int flags, int create_mode)

{

	struct ceph_fs_client *fsc = ceph_sb_to_client(sb);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(sb);

	struct ceph_mds_request *req;

	int want_auth = USE_ANY_MDS;

	int op = (flags & O_CREAT) ? CEPH_MDS_OP_CREATE : CEPH_MDS_OP_OPEN;
@@ -283,7 +282,7 @@ static int ceph_init_file(struct inode *inode, struct file *file, int fmode) 
 */

int ceph_renew_caps(struct inode *inode, int fmode)

{

	struct ceph_mds_client *mdsc = ceph_inode_to_client(inode)->mdsc;

	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(inode->i_sb);

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_mds_request *req;

	int err, flags, wanted;
@@ -1027,8 +1026,7 @@ static void ceph_aio_complete_req(struct ceph_osd_request *req) 
	struct inode *inode = req->r_inode;

	struct ceph_aio_request *aio_req = req->r_priv;

	struct ceph_osd_data *osd_data = osd_req_op_extent_osd_data(req, 0);

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_client_metric *metric = &fsc->mdsc->metric;

	struct ceph_client_metric *metric = &ceph_sb_to_mdsc(inode->i_sb)->metric;



	BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_BVECS);

	BUG_ON(!osd_data->num_bvecs);

fs/ceph/inode.c

+2 −3
Original line number Diff line number Diff line
@@ -558,8 +558,7 @@ void ceph_evict_inode(struct inode *inode) 
	 * caps in i_snap_caps.

	 */

	if (ci->i_snap_realm) {

		struct ceph_mds_client *mdsc =

					ceph_inode_to_client(inode)->mdsc;

		struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(inode->i_sb);

		if (ceph_snap(inode) == CEPH_NOSNAP) {

			struct ceph_snap_realm *realm = ci->i_snap_realm;

			dout(" dropping residual ref to snap realm %p\n",
@@ -739,7 +738,7 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page, 
		    struct ceph_mds_session *session, int cap_fmode,

		    struct ceph_cap_reservation *caps_reservation)

{

	struct ceph_mds_client *mdsc = ceph_inode_to_client(inode)->mdsc;

	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(inode->i_sb);

	struct ceph_mds_reply_inode *info = iinfo->in;

	struct ceph_inode_info *ci = ceph_inode(inode);

	int issued, new_issued, info_caps;

fs/ceph/locks.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static const struct file_lock_operations ceph_fl_lock_ops = { 
static int ceph_lock_message(u8 lock_type, u16 operation, struct inode *inode,

			     int cmd, u8 wait, struct file_lock *fl)

{

	struct ceph_mds_client *mdsc = ceph_sb_to_client(inode->i_sb)->mdsc;

	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(inode->i_sb);

	struct ceph_mds_request *req;

	int err;

	u64 length = 0;