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

Commit a3bea47e authored by Alex Elder's avatar Alex Elder
Browse files

ceph: kill ceph_osdc_new_request() "num_reply" parameter 



The "num_reply" parameter to ceph_osdc_new_request() is never
used inside that function, so get rid of it.

Note that ceph_sync_write() passes 2 for that argument, while all
other callers pass 1.  It doesn't matter, but perhaps someone should
verify this doesn't indicate a problem.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 24808826

fs/ceph/addr.c

+2 −2
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max) 
				    CEPH_OSD_OP_READ, CEPH_OSD_FLAG_READ,

				    NULL, 0,

				    ci->i_truncate_seq, ci->i_truncate_size,

				    NULL, false, 1, 0);

				    NULL, false, 0);

	if (IS_ERR(req))

		return PTR_ERR(req);
@@ -837,7 +837,7 @@ static int ceph_writepages_start(struct address_space *mapping, 
					    snapc, do_sync,

					    ci->i_truncate_seq,

					    ci->i_truncate_size,

					    &inode->i_mtime, true, 1, 0);

					    &inode->i_mtime, true, 0);



				if (IS_ERR(req)) {

					rc = PTR_ERR(req);

fs/ceph/file.c

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ static ssize_t ceph_sync_write(struct file *file, const char __user *data, 
				    ci->i_snap_realm->cached_context,

				    do_sync,

				    ci->i_truncate_seq, ci->i_truncate_size,

				    &mtime, false, 2, page_align);

				    &mtime, false, page_align);

	if (IS_ERR(req))

		return PTR_ERR(req);

include/linux/ceph/osd_client.h

+1 −2
Original line number Diff line number Diff line
@@ -234,8 +234,7 @@ extern struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *, 
				      int do_sync, u32 truncate_seq,

				      u64 truncate_size,

				      struct timespec *mtime,

				      bool use_mempool, int num_reply,

				      int page_align);

				      bool use_mempool, int page_align);



extern void ceph_osdc_set_request_linger(struct ceph_osd_client *osdc,

					 struct ceph_osd_request *req);

net/ceph/osd_client.c

+3 −3
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, 
					       u32 truncate_seq,

					       u64 truncate_size,

					       struct timespec *mtime,

					       bool use_mempool, int num_reply,

					       bool use_mempool,

					       int page_align)

{

	struct ceph_osd_req_op ops[2];
@@ -1837,7 +1837,7 @@ int ceph_osdc_readpages(struct ceph_osd_client *osdc, 
	req = ceph_osdc_new_request(osdc, layout, vino, off, plen,

				    CEPH_OSD_OP_READ, CEPH_OSD_FLAG_READ,

				    NULL, 0, truncate_seq, truncate_size, NULL,

				    false, 1, page_align);

				    false, page_align);

	if (IS_ERR(req))

		return PTR_ERR(req);
@@ -1878,7 +1878,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, 
				    CEPH_OSD_FLAG_ONDISK | CEPH_OSD_FLAG_WRITE,

				    snapc, 0,

				    truncate_seq, truncate_size, mtime,

				    true, 1, page_align);

				    true, page_align);

	if (IS_ERR(req))

		return PTR_ERR(req);