Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5a03b08 authored Jan 31, 2017 by Jeff Layton Committed by Ilya Dryomov Feb 20, 2017

ceph: drop session argument to ceph_fill_trace



Just get it from r_session since that's what's always passed in.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

parent 6fffaef9

fs/ceph/inode.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1108,9 +1108,9 @@ static struct dentry splice_dentry(struct dentry dn, struct inode *in)
	*		*
	* Called with snap_rwsem (read).		* Called with snap_rwsem (read).
	*/		*/
	int ceph_fill_trace(struct super_block sb, struct ceph_mds_request req,		int ceph_fill_trace(struct super_block sb, struct ceph_mds_request req)
	struct ceph_mds_session *session)
	{		{
			struct ceph_mds_session *session = req->r_session;
	struct ceph_mds_reply_info_parsed *rinfo = &req->r_reply_info;		struct ceph_mds_reply_info_parsed *rinfo = &req->r_reply_info;
	struct inode *in = NULL;		struct inode *in = NULL;
	struct ceph_vino vino;		struct ceph_vino vino;

fs/ceph/mds_client.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2516,7 +2516,7 @@ static void handle_reply(struct ceph_mds_session session, struct ceph_msg msg)
	/* insert trace into our cache */		/* insert trace into our cache */
	mutex_lock(&req->r_fill_mutex);		mutex_lock(&req->r_fill_mutex);
	current->journal_info = req;		current->journal_info = req;
	err = ceph_fill_trace(mdsc->fsc->sb, req, req->r_session);		err = ceph_fill_trace(mdsc->fsc->sb, req);
	if (err == 0) {		if (err == 0) {
	if (result == 0 && (req->r_op == CEPH_MDS_OP_READDIR \|\|		if (result == 0 && (req->r_op == CEPH_MDS_OP_READDIR \|\|
	req->r_op == CEPH_MDS_OP_LSSNAP))		req->r_op == CEPH_MDS_OP_LSSNAP))

fs/ceph/super.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -764,8 +764,7 @@ extern void ceph_fill_file_time(struct inode *inode, int issued,
	u64 time_warp_seq, struct timespec *ctime,		u64 time_warp_seq, struct timespec *ctime,
	struct timespec mtime, struct timespec atime);		struct timespec mtime, struct timespec atime);
	extern int ceph_fill_trace(struct super_block *sb,		extern int ceph_fill_trace(struct super_block *sb,
	struct ceph_mds_request *req,		struct ceph_mds_request *req);
	struct ceph_mds_session *session);
	extern int ceph_readdir_prepopulate(struct ceph_mds_request *req,		extern int ceph_readdir_prepopulate(struct ceph_mds_request *req,
	struct ceph_mds_session *session);		struct ceph_mds_session *session);