Commit 5995d90d authored by Xiubo Li's avatar Xiubo Li Committed by Ilya Dryomov
Browse files

ceph: rename _to_client() to _to_fs_client() 

We need to covert the inode to ceph_client in the following commit,
and will add one new helper for that, here we rename the old helper
to _fs_client().

Link: https://tracker.ceph.com/issues/61590


Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarPatrick Donnelly <pdonnell@redhat.com>
Reviewed-by: default avatarMilind Changire <mchangir@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 197b7d79

fs/ceph/addr.c

+10 −10
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static void ceph_netfs_expand_readahead(struct netfs_io_request *rreq) 
static bool ceph_netfs_clamp_length(struct netfs_io_subrequest *subreq)

{

	struct inode *inode = subreq->rreq->inode;

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);

	struct ceph_inode_info *ci = ceph_inode(inode);

	u64 objno, objoff;

	u32 xlen;
@@ -244,7 +244,7 @@ static bool ceph_netfs_clamp_length(struct netfs_io_subrequest *subreq) 
static void finish_netfs_read(struct ceph_osd_request *req)

{

	struct inode *inode = req->r_inode;

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);

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

	struct netfs_io_subrequest *subreq = req->r_priv;

	struct ceph_osd_req_op *op = &req->r_ops[0];
@@ -348,7 +348,7 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) 
	struct netfs_io_request *rreq = subreq->rreq;

	struct inode *inode = rreq->inode;

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);

	struct ceph_osd_request *req = NULL;

	struct ceph_vino vino = ceph_vino(inode);

	struct iov_iter iter;
@@ -658,7 +658,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) 
	struct folio *folio = page_folio(page);

	struct inode *inode = page->mapping->host;

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);

	struct ceph_snap_context *snapc, *oldest;

	loff_t page_off = page_offset(page);

	int err;
@@ -803,7 +803,7 @@ static int ceph_writepage(struct page *page, struct writeback_control *wbc) 
	ihold(inode);



	if (wbc->sync_mode == WB_SYNC_NONE &&

	    ceph_inode_to_client(inode)->write_congested)

	    ceph_inode_to_fs_client(inode)->write_congested)

		return AOP_WRITEPAGE_ACTIVATE;



	wait_on_page_fscache(page);
@@ -836,7 +836,7 @@ static void writepages_finish(struct ceph_osd_request *req) 
	int rc = req->r_result;

	struct ceph_snap_context *snapc = req->r_snapc;

	struct address_space *mapping = inode->i_mapping;

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);

	unsigned int len = 0;

	bool remove_page;
@@ -926,7 +926,7 @@ static int ceph_writepages_start(struct address_space *mapping, 
{

	struct inode *inode = mapping->host;

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);

	struct ceph_vino vino = ceph_vino(inode);

	pgoff_t index, start_index, end = -1;

	struct ceph_snap_context *snapc = NULL, *last_snapc = NULL, *pgsnapc;
@@ -1823,7 +1823,7 @@ int ceph_uninline_data(struct file *file) 
{

	struct inode *inode = file_inode(file);

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);

	struct ceph_osd_request *req = NULL;

	struct ceph_cap_flush *prealloc_cf = NULL;

	struct folio *folio = NULL;
@@ -1977,7 +1977,7 @@ enum { 
static int __ceph_pool_perm_get(struct ceph_inode_info *ci,

				s64 pool, struct ceph_string *pool_ns)

{

	struct ceph_fs_client *fsc = ceph_inode_to_client(&ci->netfs.inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(&ci->netfs.inode);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_osd_request *rd_req = NULL, *wr_req = NULL;

	struct rb_node **p, *parent;
@@ -2168,7 +2168,7 @@ int ceph_pool_perm_check(struct inode *inode, int need) 
		return 0;

	}



	if (ceph_test_mount_opt(ceph_inode_to_client(inode),

	if (ceph_test_mount_opt(ceph_inode_to_fs_client(inode),

				NOPOOLPERM))

		return 0;

fs/ceph/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
void ceph_fscache_register_inode_cookie(struct inode *inode)

{

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);



	/* No caching for filesystem? */

	if (!fsc->fscache)

fs/ceph/caps.c

+20 −20
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ void ceph_add_cap(struct inode *inode, 
		  unsigned seq, unsigned mseq, u64 realmino, int flags,

		  struct ceph_cap **new_cap)

{

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

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

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_cap *cap;

	int mds = session->s_mds;
@@ -922,7 +922,7 @@ int __ceph_caps_issued_mask(struct ceph_inode_info *ci, int mask, int touch) 
int __ceph_caps_issued_mask_metric(struct ceph_inode_info *ci, int mask,

				   int touch)

{

	struct ceph_fs_client *fsc = ceph_sb_to_client(ci->netfs.inode.i_sb);

	struct ceph_fs_client *fsc = ceph_sb_to_fs_client(ci->netfs.inode.i_sb);

	int r;



	r = __ceph_caps_issued_mask(ci, mask, touch);
@@ -996,7 +996,7 @@ int __ceph_caps_file_wanted(struct ceph_inode_info *ci) 
	const int WR_SHIFT = ffs(CEPH_FILE_MODE_WR);

	const int LAZY_SHIFT = ffs(CEPH_FILE_MODE_LAZY);

	struct ceph_mount_options *opt =

		ceph_inode_to_client(&ci->netfs.inode)->mount_options;

		ceph_inode_to_fs_client(&ci->netfs.inode)->mount_options;

	unsigned long used_cutoff = jiffies - opt->caps_wanted_delay_max * HZ;

	unsigned long idle_cutoff = jiffies - opt->caps_wanted_delay_min * HZ;
@@ -1121,7 +1121,7 @@ void __ceph_remove_cap(struct ceph_cap *cap, bool queue_release) 


	dout("__ceph_remove_cap %p from %p\n", cap, &ci->netfs.inode);



	mdsc = ceph_inode_to_client(&ci->netfs.inode)->mdsc;

	mdsc = ceph_inode_to_fs_client(&ci->netfs.inode)->mdsc;



	/* remove from inode's cap rbtree, and clear auth cap */

	rb_erase(&cap->ci_node, &ci->i_caps);
@@ -1192,7 +1192,7 @@ void ceph_remove_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap, 


	lockdep_assert_held(&ci->i_ceph_lock);



	fsc = ceph_inode_to_client(&ci->netfs.inode);

	fsc = ceph_inode_to_fs_client(&ci->netfs.inode);

	WARN_ON_ONCE(ci->i_auth_cap == cap &&

		     !list_empty(&ci->i_dirty_item) &&

		     !fsc->blocklisted &&
@@ -1344,7 +1344,7 @@ static void encode_cap_msg(struct ceph_msg *msg, struct cap_msg_args *arg) 
void __ceph_remove_caps(struct ceph_inode_info *ci)

{

	struct inode *inode = &ci->netfs.inode;

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

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

	struct rb_node *p;



	/* lock i_ceph_lock, because ceph_d_revalidate(..., LOOKUP_RCU)
@@ -1688,7 +1688,7 @@ void ceph_flush_snaps(struct ceph_inode_info *ci, 
		      struct ceph_mds_session **psession)

{

	struct inode *inode = &ci->netfs.inode;

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

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

	struct ceph_mds_session *session = NULL;

	bool need_put = false;

	int mds;
@@ -1753,7 +1753,7 @@ int __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask, 
			   struct ceph_cap_flush **pcf)

{

	struct ceph_mds_client *mdsc =

		ceph_sb_to_client(ci->netfs.inode.i_sb)->mdsc;

		ceph_sb_to_fs_client(ci->netfs.inode.i_sb)->mdsc;

	struct inode *inode = &ci->netfs.inode;

	int was = ci->i_dirty_caps;

	int dirty = 0;
@@ -1876,7 +1876,7 @@ static u64 __mark_caps_flushing(struct inode *inode, 
				struct ceph_mds_session *session, bool wake,

				u64 *oldest_flush_tid)

{

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

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

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_cap_flush *cf = NULL;

	int flushing;
@@ -2235,7 +2235,7 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags) 
 */

static int try_flush_caps(struct inode *inode, u64 *ptid)

{

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

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

	struct ceph_inode_info *ci = ceph_inode(inode);

	int flushing = 0;

	u64 flush_tid = 0, oldest_flush_tid = 0;
@@ -2313,7 +2313,7 @@ static int caps_are_flushed(struct inode *inode, u64 flush_tid) 
 */

static int flush_mdlog_and_wait_inode_unsafe_requests(struct inode *inode)

{

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

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

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_mds_request *req1 = NULL, *req2 = NULL;

	int ret, err = 0;
@@ -2496,7 +2496,7 @@ int ceph_write_inode(struct inode *inode, struct writeback_control *wbc) 
				       caps_are_flushed(inode, flush_tid));

	} else {

		struct ceph_mds_client *mdsc =

			ceph_sb_to_client(inode->i_sb)->mdsc;

			ceph_sb_to_fs_client(inode->i_sb)->mdsc;



		spin_lock(&ci->i_ceph_lock);

		if (__ceph_caps_dirty(ci))
@@ -2749,7 +2749,7 @@ static int try_get_cap_refs(struct inode *inode, int need, int want, 
			    loff_t endoff, int flags, int *got)

{

	struct ceph_inode_info *ci = ceph_inode(inode);

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

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

	int ret = 0;

	int have, implemented;

	bool snap_rwsem_locked = false;
@@ -2967,7 +2967,7 @@ int __ceph_get_caps(struct inode *inode, struct ceph_file_info *fi, int need, 
		    int want, loff_t endoff, int *got)

{

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);

	int ret, _got, flags;



	ret = ceph_pool_perm_check(inode, need);
@@ -3730,7 +3730,7 @@ static void handle_cap_flush_ack(struct inode *inode, u64 flush_tid, 
	__releases(ci->i_ceph_lock)

{

	struct ceph_inode_info *ci = ceph_inode(inode);

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

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

	struct ceph_cap_flush *cf, *tmp_cf;

	LIST_HEAD(to_remove);

	unsigned seq = le32_to_cpu(m->seq);
@@ -3836,7 +3836,7 @@ void __ceph_remove_capsnap(struct inode *inode, struct ceph_cap_snap *capsnap, 
			   bool *wake_ci, bool *wake_mdsc)

{

	struct ceph_inode_info *ci = ceph_inode(inode);

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

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

	bool ret;



	lockdep_assert_held(&ci->i_ceph_lock);
@@ -3880,7 +3880,7 @@ static void handle_cap_flushsnap_ack(struct inode *inode, u64 flush_tid, 
				     struct ceph_mds_session *session)

{

	struct ceph_inode_info *ci = ceph_inode(inode);

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

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

	u64 follows = le64_to_cpu(m->snap_follows);

	struct ceph_cap_snap *capsnap = NULL, *iter;

	bool wake_ci = false;
@@ -3972,7 +3972,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, 
			      struct ceph_mds_cap_peer *ph,

			      struct ceph_mds_session *session)

{

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

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

	struct ceph_mds_session *tsession = NULL;

	struct ceph_cap *cap, *tcap, *new_cap = NULL;

	struct ceph_inode_info *ci = ceph_inode(inode);
@@ -4675,7 +4675,7 @@ int ceph_drop_caps_for_unlink(struct inode *inode) 


		if (__ceph_caps_dirty(ci)) {

			struct ceph_mds_client *mdsc =

				ceph_inode_to_client(inode)->mdsc;

				ceph_inode_to_fs_client(inode)->mdsc;

			__cap_delay_requeue_front(mdsc, ci);

		}

	}
@@ -4858,7 +4858,7 @@ static int remove_capsnaps(struct ceph_mds_client *mdsc, struct inode *inode) 


int ceph_purge_inode_cap(struct inode *inode, struct ceph_cap *cap, bool *invalidate)

{

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_inode_info *ci = ceph_inode(inode);

	bool is_auth;

fs/ceph/crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static bool ceph_crypt_empty_dir(struct inode *inode) 


static const union fscrypt_policy *ceph_get_dummy_policy(struct super_block *sb)

{

	return ceph_sb_to_client(sb)->fsc_dummy_enc_policy.policy;

	return ceph_sb_to_fs_client(sb)->fsc_dummy_enc_policy.policy;

}



static struct fscrypt_operations ceph_fscrypt_ops = {

fs/ceph/dir.c

+11 −11
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx) 
	struct ceph_dir_file_info *dfi = file->private_data;

	struct inode *inode = file_inode(file);

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	int i;

	int err;
@@ -703,7 +703,7 @@ static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int whence) 
struct dentry *ceph_handle_snapdir(struct ceph_mds_request *req,

				   struct dentry *dentry)

{

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

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

	struct inode *parent = d_inode(dentry->d_parent); /* we hold i_rwsem */



	/* .snap dir? */
@@ -771,7 +771,7 @@ static bool is_root_ceph_dentry(struct inode *inode, struct dentry *dentry) 
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_fs_client *fsc = ceph_sb_to_fs_client(dir->i_sb);

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

	struct ceph_mds_request *req;

	int op;
@@ -1199,7 +1199,7 @@ static void ceph_async_unlink_cb(struct ceph_mds_client *mdsc, 
				 struct ceph_mds_request *req)

{

	struct dentry *dentry = req->r_dentry;

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

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

	struct ceph_dentry_info *di = ceph_dentry(dentry);

	int result = req->r_err ? req->r_err :

			le32_to_cpu(req->r_reply_info.head->result);
@@ -1290,7 +1290,7 @@ static int get_caps_for_async_unlink(struct inode *dir, struct dentry *dentry) 
 */

static int ceph_unlink(struct inode *dir, struct dentry *dentry)

{

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

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

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct inode *inode = d_inode(dentry);

	struct ceph_mds_request *req;
@@ -1469,7 +1469,7 @@ void __ceph_dentry_lease_touch(struct ceph_dentry_info *di) 
		return;

	}



	mdsc = ceph_sb_to_client(dn->d_sb)->mdsc;

	mdsc = ceph_sb_to_fs_client(dn->d_sb)->mdsc;

	spin_lock(&mdsc->dentry_list_lock);

	list_move_tail(&di->lease_list, &mdsc->dentry_leases);

	spin_unlock(&mdsc->dentry_list_lock);
@@ -1516,7 +1516,7 @@ void __ceph_dentry_dir_lease_touch(struct ceph_dentry_info *di) 
		return;

	}



	mdsc = ceph_sb_to_client(dn->d_sb)->mdsc;

	mdsc = ceph_sb_to_fs_client(dn->d_sb)->mdsc;

	spin_lock(&mdsc->dentry_list_lock);

	__dentry_dir_lease_touch(mdsc, di),

	spin_unlock(&mdsc->dentry_list_lock);
@@ -1530,7 +1530,7 @@ static void __dentry_lease_unlist(struct ceph_dentry_info *di) 
	if (list_empty(&di->lease_list))

		return;



	mdsc = ceph_sb_to_client(di->dentry->d_sb)->mdsc;

	mdsc = ceph_sb_to_fs_client(di->dentry->d_sb)->mdsc;

	spin_lock(&mdsc->dentry_list_lock);

	list_del_init(&di->lease_list);

	spin_unlock(&mdsc->dentry_list_lock);
@@ -1888,7 +1888,7 @@ static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags) 
	     dentry, inode, ceph_dentry(dentry)->offset,

	     !!(dentry->d_flags & DCACHE_NOKEY_NAME));



	mdsc = ceph_sb_to_client(dir->i_sb)->mdsc;

	mdsc = ceph_sb_to_fs_client(dir->i_sb)->mdsc;



	/* always trust cached snapped dentries, snapdir dentry */

	if (ceph_snap(dir) != CEPH_NOSNAP) {
@@ -1995,7 +1995,7 @@ static int ceph_d_delete(const struct dentry *dentry) 
static void ceph_d_release(struct dentry *dentry)

{

	struct ceph_dentry_info *di = ceph_dentry(dentry);

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

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



	dout("d_release %p\n", dentry);
@@ -2064,7 +2064,7 @@ static ssize_t ceph_read_dir(struct file *file, char __user *buf, size_t size, 
	int left;

	const int bufsize = 1024;



	if (!ceph_test_mount_opt(ceph_sb_to_client(inode->i_sb), DIRSTAT))

	if (!ceph_test_mount_opt(ceph_sb_to_fs_client(inode->i_sb), DIRSTAT))

		return -EISDIR;



	if (!dfi->dir_info) {