Commit 966c7160 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: make ceph_fill_inode non-static 



Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 2ccb4546

fs/ceph/inode.c

+24 −23
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ void ceph_fill_file_time(struct inode *inode, int issued, 
 * Populate an inode based on info from mds.  May be called on new or

 * existing inodes.

 */

static int fill_inode(struct inode *inode, struct page *locked_page,

int ceph_fill_inode(struct inode *inode, struct page *locked_page,

		    struct ceph_mds_reply_info_in *iinfo,

		    struct ceph_mds_reply_dirfrag *dirinfo,

		    struct ceph_mds_session *session, int cap_fmode,
@@ -749,7 +749,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page, 
	bool new_version = false;

	bool fill_inline = false;



	dout("fill_inode %p ino %llx.%llx v %llu had %llu\n",

	dout("%s %p ino %llx.%llx v %llu had %llu\n", __func__,

	     inode, ceph_vinop(inode), le64_to_cpu(info->version),

	     ci->i_version);
@@ -770,7 +770,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page, 
	if (iinfo->xattr_len > 4) {

		xattr_blob = ceph_buffer_new(iinfo->xattr_len, GFP_NOFS);

		if (!xattr_blob)

			pr_err("fill_inode ENOMEM xattr blob %d bytes\n",

			pr_err("%s ENOMEM xattr blob %d bytes\n", __func__,

			       iinfo->xattr_len);

	}
@@ -933,8 +933,9 @@ static int fill_inode(struct inode *inode, struct page *locked_page, 
			spin_unlock(&ci->i_ceph_lock);



			if (symlen != i_size_read(inode)) {

				pr_err("fill_inode %llx.%llx BAD symlink "

					"size %lld\n", ceph_vinop(inode),

				pr_err("%s %llx.%llx BAD symlink "

					"size %lld\n", __func__,

					ceph_vinop(inode),

					i_size_read(inode));

				i_size_write(inode, symlen);

				inode->i_blocks = calc_inode_blocks(symlen);
@@ -958,7 +959,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page, 
		inode->i_fop = &ceph_dir_fops;

		break;

	default:

		pr_err("fill_inode %llx.%llx BAD mode 0%o\n",

		pr_err("%s %llx.%llx BAD mode 0%o\n", __func__,

		       ceph_vinop(inode), inode->i_mode);

	}
@@ -1246,9 +1247,8 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) 
		struct inode *dir = req->r_parent;



		if (dir) {

			err = fill_inode(dir, NULL,

					 &rinfo->diri, rinfo->dirfrag,

					 session, -1,

			err = ceph_fill_inode(dir, NULL, &rinfo->diri,

					      rinfo->dirfrag, session, -1,

					      &req->r_caps_reservation);

			if (err < 0)

				goto done;
@@ -1314,14 +1314,14 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) 
			goto done;

		}



		err = fill_inode(in, req->r_locked_page, &rinfo->targeti, NULL,

				session,

		err = ceph_fill_inode(in, req->r_locked_page, &rinfo->targeti,

				NULL, session,

				(!test_bit(CEPH_MDS_R_ABORTED, &req->r_req_flags) &&

				 !test_bit(CEPH_MDS_R_ASYNC, &req->r_req_flags) &&

				 rinfo->head->result == 0) ?  req->r_fmode : -1,

				&req->r_caps_reservation);

		if (err < 0) {

			pr_err("fill_inode badness %p %llx.%llx\n",

			pr_err("ceph_fill_inode badness %p %llx.%llx\n",

				in, ceph_vinop(in));

			if (in->i_state & I_NEW)

				discard_new_inode(in);
@@ -1508,10 +1508,11 @@ static int readdir_prepopulate_inodes_only(struct ceph_mds_request *req, 
			dout("new_inode badness got %d\n", err);

			continue;

		}

		rc = fill_inode(in, NULL, &rde->inode, NULL, session,

		rc = ceph_fill_inode(in, NULL, &rde->inode, NULL, session,

				     -1, &req->r_caps_reservation);

		if (rc < 0) {

			pr_err("fill_inode badness on %p got %d\n", in, rc);

			pr_err("ceph_fill_inode badness on %p got %d\n",

			       in, rc);

			err = rc;

			if (in->i_state & I_NEW) {

				ihold(in);
@@ -1715,10 +1716,10 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req, 
			}

		}



		ret = fill_inode(in, NULL, &rde->inode, NULL, session,

		ret = ceph_fill_inode(in, NULL, &rde->inode, NULL, session,

				      -1, &req->r_caps_reservation);

		if (ret < 0) {

			pr_err("fill_inode badness on %p\n", in);

			pr_err("ceph_fill_inode badness on %p\n", in);

			if (d_really_is_negative(dn)) {

				/* avoid calling iput_final() in mds

				 * dispatch threads */

fs/ceph/super.h

+8 −0
Original line number Diff line number Diff line
@@ -895,6 +895,9 @@ static inline bool __ceph_have_pending_cap_snap(struct ceph_inode_info *ci) 
}



/* inode.c */

struct ceph_mds_reply_info_in;

struct ceph_mds_reply_dirfrag;



extern const struct inode_operations ceph_file_iops;



extern struct inode *ceph_alloc_inode(struct super_block *sb);
@@ -910,6 +913,11 @@ extern void ceph_fill_file_time(struct inode *inode, int issued, 
				u64 time_warp_seq, struct timespec64 *ctime,

				struct timespec64 *mtime,

				struct timespec64 *atime);

extern int ceph_fill_inode(struct inode *inode, struct page *locked_page,

		    struct ceph_mds_reply_info_in *iinfo,

		    struct ceph_mds_reply_dirfrag *dirinfo,

		    struct ceph_mds_session *session, int cap_fmode,

		    struct ceph_cap_reservation *caps_reservation);

extern int ceph_fill_trace(struct super_block *sb,

			   struct ceph_mds_request *req);

extern int ceph_readdir_prepopulate(struct ceph_mds_request *req,