libceph: clean up ceph_osdc_start_request prototype
PATCH 1/1 libceph: clean up ceph_osdc_start_request prototype
This function always returns 0, and ignores the nofail boolean. Drop the nofail argument, make the function void return and fix up the callers.
--- drivers/block/rbd.c | 6 +++--- fs/ceph/addr.c | 32 ++++++++++++-------------------- fs/ceph/file.c | 32 +++++++++++++------------------- include/linux/ceph/osd_client.h | 5 ++--- net/ceph/osd_client.c | 15 ++++++--------- 5 files changed, 36 insertions(+), 54 deletions(-)
drivers/block/rbd.c +3 -3
@@ -1297,7 +1297,7 @@ static void rbd_osd_submit(struct ceph_osd_request *osd_req)dout ("%s osd_req %p for obj_req %p objno %llu %llu~%llu\n" , __func__, osd_req, obj_req, obj_req->ex.oe_objno, obj_req->ex.oe_off, obj_req->ex.oe_len); -ceph_osdc_start_request (osd_req->r_osdc, osd_req, false); +ceph_osdc_start_request (osd_req->r_osdc, osd_req); }/*
@@ -2081,7 +2081,7 @@ static int rbd_object_map_update(struct rbd_obj_request *obj_req, u64 snap_id,if (ret)return ret; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req);return 0 ; }
@@ -4768,7 +4768,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,if (ret) goto out_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req);if (ret >=0 )ceph_copy_from_page_vector (pages, buf,0 , ret);
fs/ceph/addr.c +12 -20
@@ -357,9 +357,7 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) req->r_inode = inode;ihold (inode); - err =ceph_osdc_start_request (req->r_osdc, req, false); -if (err) -iput (inode); +ceph_osdc_start_request (req->r_osdc, req); out:ceph_osdc_put_request (req);if (err)
@@ -633,9 +631,8 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)dout ("writepage %llu~%llu (%llu bytes)\n" , page_off, len, len); req->r_mtime = inode->i_mtime; - err =ceph_osdc_start_request (osdc, req, true); -if (!err) - err =ceph_osdc_wait_request (osdc, req); +ceph_osdc_start_request (osdc, req); + err =ceph_osdc_wait_request (osdc, req);ceph_update_write_metrics (&fsc->mdsc->metric, req->r_start_latency, req->r_end_latency, len, err);
@@ -1163,8 +1160,7 @@ static int ceph_writepages_start(struct address_space *mapping, } req->r_mtime = inode->i_mtime; - rc =ceph_osdc_start_request (&fsc->client->osdc, req, true); -BUG_ON (rc); +ceph_osdc_start_request (&fsc->client->osdc, req); req =NULL ; wbc->nr_to_write -= i;
@@ -1707,9 +1703,8 @@ int ceph_uninline_data(struct file *file) } req->r_mtime = inode->i_mtime; - err =ceph_osdc_start_request (&fsc->client->osdc, req, false); -if (!err) - err =ceph_osdc_wait_request (&fsc->client->osdc, req); +ceph_osdc_start_request (&fsc->client->osdc, req); + err =ceph_osdc_wait_request (&fsc->client->osdc, req);ceph_osdc_put_request (req);if (err <0 ) goto out_unlock;
@@ -1750,9 +1745,8 @@ int ceph_uninline_data(struct file *file) } req->r_mtime = inode->i_mtime; - err =ceph_osdc_start_request (&fsc->client->osdc, req, false); -if (!err) - err =ceph_osdc_wait_request (&fsc->client->osdc, req); +ceph_osdc_start_request (&fsc->client->osdc, req); + err =ceph_osdc_wait_request (&fsc->client->osdc, req);ceph_update_write_metrics (&fsc->mdsc->metric, req->r_start_latency, req->r_end_latency, len, err);
@@ -1923,15 +1917,13 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci,osd_req_op_raw_data_in_pages (rd_req,0 , pages,PAGE_SIZE ,0 , false, true); - err =ceph_osdc_start_request (&fsc->client->osdc, rd_req, false); +ceph_osdc_start_request (&fsc->client->osdc, rd_req); wr_req->r_mtime = ci->netfs.inode.i_mtime; - err2 =ceph_osdc_start_request (&fsc->client->osdc, wr_req, false); +ceph_osdc_start_request (&fsc->client->osdc, wr_req); -if (!err) - err =ceph_osdc_wait_request (&fsc->client->osdc, rd_req); -if (!err2) - err2 =ceph_osdc_wait_request (&fsc->client->osdc, wr_req); + err =ceph_osdc_wait_request (&fsc->client->osdc, rd_req); + err2 =ceph_osdc_wait_request (&fsc->client->osdc, wr_req);if (err >=0 || err == -ENOENT ) have |=POOL_READ ;
fs/ceph/file.c +13 -19
@@ -1008,9 +1008,8 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to, } } - ret =ceph_osdc_start_request (osdc, req, false); -if (!ret) - ret =ceph_osdc_wait_request (osdc, req); +ceph_osdc_start_request (osdc, req); + ret =ceph_osdc_wait_request (osdc, req); ceph_update_read_metrics(&fsc->mdsc->metric, req->r_start_latency,
@@ -1282,7 +1281,7 @@ static void ceph_aio_retry_work(struct work_struct *work) req->r_inode = inode; req->r_priv = aio_req; - ret =ceph_osdc_start_request (req->r_osdc, req, false); +ceph_osdc_start_request (req->r_osdc, req); out:if (ret <0 ) { req->r_result = ret;
@@ -1429,9 +1428,8 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,continue ; } - ret =ceph_osdc_start_request (req->r_osdc, req, false); -if (!ret) - ret =ceph_osdc_wait_request (&fsc->client->osdc, req); +ceph_osdc_start_request (req->r_osdc, req); + ret =ceph_osdc_wait_request (&fsc->client->osdc, req);if (write) ceph_update_write_metrics(metric, req->r_start_latency,
@@ -1497,8 +1495,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter, r_private_item);list_del_init (&req->r_private_item);if (ret >=0 ) - ret =ceph_osdc_start_request (req->r_osdc, - req, false); +ceph_osdc_start_request (req->r_osdc, req);if (ret <0 ) { req->r_result = ret;ceph_aio_complete_req (req);
@@ -1611,9 +1608,8 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos, false, true); req->r_mtime = mtime; - ret =ceph_osdc_start_request (&fsc->client->osdc, req, false); -if (!ret) - ret =ceph_osdc_wait_request (&fsc->client->osdc, req); +ceph_osdc_start_request (&fsc->client->osdc, req); + ret =ceph_osdc_wait_request (&fsc->client->osdc, req);ceph_update_write_metrics (&fsc->mdsc->metric, req->r_start_latency, req->r_end_latency, len, ret);
@@ -2077,12 +2073,10 @@ static int ceph_zero_partial_object(struct inode *inode, } req->r_mtime = inode->i_mtime; - ret =ceph_osdc_start_request (&fsc->client->osdc, req, false); -if (!ret) { - ret =ceph_osdc_wait_request (&fsc->client->osdc, req); -if (ret == -ENOENT ) - ret =0 ; - } +ceph_osdc_start_request (&fsc->client->osdc, req); + ret =ceph_osdc_wait_request (&fsc->client->osdc, req); +if (ret == -ENOENT ) + ret =0 ;ceph_osdc_put_request (req); out:
@@ -2384,7 +2378,7 @@ static ssize_t ceph_do_objects_copy(struct ceph_inode_info *src_ci, u64 *src_offif (IS_ERR (req)) ret =PTR_ERR (req);else { -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req); ceph_update_copyfrom_metrics(&fsc->mdsc->metric, req->r_start_latency,
include/linux/ceph/osd_client.h +2 -3
@@ -572,9 +572,8 @@ static inline int ceph_alloc_sparse_ext_map(struct ceph_osd_req_op *op)extern void ceph_osdc_get_request (struct ceph_osd_request *req);extern void ceph_osdc_put_request (struct ceph_osd_request *req); -extern int ceph_osdc_start_request (struct ceph_osd_client *osdc, -struct ceph_osd_request *req, -bool nofail); +void ceph_osdc_start_request (struct ceph_osd_client *osdc, +struct ceph_osd_request *req);extern void ceph_osdc_cancel_request (struct ceph_osd_request *req);extern int ceph_osdc_wait_request (struct ceph_osd_client *osdc,struct ceph_osd_request *req);
net/ceph/osd_client.c +6 -9
@@ -4615,15 +4615,12 @@ static void handle_watch_notify(struct ceph_osd_client *osdc,/* * Register request, send initial attempt. */ -int ceph_osdc_start_request (struct ceph_osd_client *osdc, -struct ceph_osd_request *req, -bool nofail) +void ceph_osdc_start_request (struct ceph_osd_client *osdc, +struct ceph_osd_request *req) {down_read (&osdc->lock);submit_request (req, false);up_read (&osdc->lock); - -return 0 ; }EXPORT_SYMBOL (ceph_osdc_start_request);
@@ -4793,7 +4790,7 @@ int ceph_osdc_unwatch(struct ceph_osd_client *osdc,if (ret) goto out_put_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req);linger_cancel (lreq);linger_put (lreq); ret =wait_request_timeout (req, opts->mount_timeout);
@@ -4864,7 +4861,7 @@ int ceph_osdc_notify_ack(struct ceph_osd_client *osdc,if (ret) goto out_put_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req); out_put_req:
@@ -5080,7 +5077,7 @@ int ceph_osdc_list_watchers(struct ceph_osd_client *osdc,if (ret) goto out_put_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req);if (ret >=0 ) {void *p =page_address (pages[0 ]);
@@ -5157,7 +5154,7 @@ int ceph_osdc_call(struct ceph_osd_client *osdc,if (ret) goto out_put_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req);if (ret >=0 ) { ret = req->r_ops[0 ].rval;
Signature · 1 line
2.36.1
Quoted 275 lines · Jeff Layton
This function always returns 0, and ignores the nofail boolean. Drop the nofail argument, make the function void return and fix up the callers.
Signed-off-by Jeff Layton <[email protected]>--- drivers/block/rbd.c | 6 +++--- fs/ceph/addr.c | 32 ++++++++++++-------------------- fs/ceph/file.c | 32 +++++++++++++------------------- include/linux/ceph/osd_client.h | 5 ++--- net/ceph/osd_client.c | 15 ++++++--------- 5 files changed, 36 insertions(+), 54 deletions(-)drivers/block/rbd.c +3
-3@@ -1297,7 +1297,7 @@ static void rbd_osd_submit(struct ceph_osd_request *osd_req)dout ("%s osd_req %p for obj_req %p objno %llu %llu~%llu\n" , __func__, osd_req, obj_req, obj_req->ex.oe_objno, obj_req->ex.oe_off, obj_req->ex.oe_len); -ceph_osdc_start_request (osd_req->r_osdc, osd_req, false); +ceph_osdc_start_request (osd_req->r_osdc, osd_req); }/* @@ -2081,7 +2081,7 @@ static int rbd_object_map_update(struct rbd_obj_request *obj_req, u64 snap_id,if (ret)return ret; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req);return 0 ; }@@ -4768,7 +4768,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,if (ret) goto out_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req);if (ret >=0 )ceph_copy_from_page_vector (pages, buf,0 , ret);fs/ceph/addr.c +12
-20@@ -357,9 +357,7 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) req->r_inode = inode;ihold (inode); - err =ceph_osdc_start_request (req->r_osdc, req, false); -if (err) -iput (inode); +ceph_osdc_start_request (req->r_osdc, req); out:ceph_osdc_put_request (req);if (err)@@ -633,9 +631,8 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)dout ("writepage %llu~%llu (%llu bytes)\n" , page_off, len, len); req->r_mtime = inode->i_mtime; - err =ceph_osdc_start_request (osdc, req, true); -if (!err) - err =ceph_osdc_wait_request (osdc, req); +ceph_osdc_start_request (osdc, req); + err =ceph_osdc_wait_request (osdc, req);ceph_update_write_metrics (&fsc->mdsc->metric, req->r_start_latency, req->r_end_latency, len, err);@@ -1163,8 +1160,7 @@ static int ceph_writepages_start(struct address_space *mapping, } req->r_mtime = inode->i_mtime; - rc =ceph_osdc_start_request (&fsc->client->osdc, req, true); -BUG_ON (rc); +ceph_osdc_start_request (&fsc->client->osdc, req); req =NULL ; wbc->nr_to_write -= i;@@ -1707,9 +1703,8 @@ int ceph_uninline_data(struct file *file) } req->r_mtime = inode->i_mtime; - err =ceph_osdc_start_request (&fsc->client->osdc, req, false); -if (!err) - err =ceph_osdc_wait_request (&fsc->client->osdc, req); +ceph_osdc_start_request (&fsc->client->osdc, req); + err =ceph_osdc_wait_request (&fsc->client->osdc, req);ceph_osdc_put_request (req);if (err <0 ) goto out_unlock;@@ -1750,9 +1745,8 @@ int ceph_uninline_data(struct file *file) } req->r_mtime = inode->i_mtime; - err =ceph_osdc_start_request (&fsc->client->osdc, req, false); -if (!err) - err =ceph_osdc_wait_request (&fsc->client->osdc, req); +ceph_osdc_start_request (&fsc->client->osdc, req); + err =ceph_osdc_wait_request (&fsc->client->osdc, req);ceph_update_write_metrics (&fsc->mdsc->metric, req->r_start_latency, req->r_end_latency, len, err);@@ -1923,15 +1917,13 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci,osd_req_op_raw_data_in_pages (rd_req,0 , pages,PAGE_SIZE ,0 , false, true); - err =ceph_osdc_start_request (&fsc->client->osdc, rd_req, false); +ceph_osdc_start_request (&fsc->client->osdc, rd_req); wr_req->r_mtime = ci->netfs.inode.i_mtime; - err2 =ceph_osdc_start_request (&fsc->client->osdc, wr_req, false); +ceph_osdc_start_request (&fsc->client->osdc, wr_req); -if (!err) - err =ceph_osdc_wait_request (&fsc->client->osdc, rd_req); -if (!err2) - err2 =ceph_osdc_wait_request (&fsc->client->osdc, wr_req); + err =ceph_osdc_wait_request (&fsc->client->osdc, rd_req); + err2 =ceph_osdc_wait_request (&fsc->client->osdc, wr_req);if (err >=0 || err == -ENOENT ) have |=POOL_READ ;fs/ceph/file.c +13
-19@@ -1008,9 +1008,8 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to, } } - ret =ceph_osdc_start_request (osdc, req, false); -if (!ret) - ret =ceph_osdc_wait_request (osdc, req); +ceph_osdc_start_request (osdc, req); + ret =ceph_osdc_wait_request (osdc, req); ceph_update_read_metrics(&fsc->mdsc->metric, req->r_start_latency,@@ -1282,7 +1281,7 @@ static void ceph_aio_retry_work(struct work_struct *work) req->r_inode = inode; req->r_priv = aio_req; - ret =ceph_osdc_start_request (req->r_osdc, req, false); +ceph_osdc_start_request (req->r_osdc, req); out:if (ret <0 ) { req->r_result = ret;@@ -1429,9 +1428,8 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,continue ; } - ret =ceph_osdc_start_request (req->r_osdc, req, false); -if (!ret) - ret =ceph_osdc_wait_request (&fsc->client->osdc, req); +ceph_osdc_start_request (req->r_osdc, req); + ret =ceph_osdc_wait_request (&fsc->client->osdc, req);if (write) ceph_update_write_metrics(metric, req->r_start_latency,@@ -1497,8 +1495,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter, r_private_item);list_del_init (&req->r_private_item);if (ret >=0 ) - ret =ceph_osdc_start_request (req->r_osdc, - req, false); +ceph_osdc_start_request (req->r_osdc, req);if (ret <0 ) { req->r_result = ret;ceph_aio_complete_req (req);@@ -1611,9 +1608,8 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos, false, true); req->r_mtime = mtime; - ret =ceph_osdc_start_request (&fsc->client->osdc, req, false); -if (!ret) - ret =ceph_osdc_wait_request (&fsc->client->osdc, req); +ceph_osdc_start_request (&fsc->client->osdc, req); + ret =ceph_osdc_wait_request (&fsc->client->osdc, req);ceph_update_write_metrics (&fsc->mdsc->metric, req->r_start_latency, req->r_end_latency, len, ret);@@ -2077,12 +2073,10 @@ static int ceph_zero_partial_object(struct inode *inode, } req->r_mtime = inode->i_mtime; - ret =ceph_osdc_start_request (&fsc->client->osdc, req, false); -if (!ret) { - ret =ceph_osdc_wait_request (&fsc->client->osdc, req); -if (ret == -ENOENT ) - ret =0 ; - } +ceph_osdc_start_request (&fsc->client->osdc, req); + ret =ceph_osdc_wait_request (&fsc->client->osdc, req); +if (ret == -ENOENT ) + ret =0 ;ceph_osdc_put_request (req); out:@@ -2384,7 +2378,7 @@ static ssize_t ceph_do_objects_copy(struct ceph_inode_info *src_ci, u64 *src_offif (IS_ERR (req)) ret =PTR_ERR (req);else { -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req); ceph_update_copyfrom_metrics(&fsc->mdsc->metric, req->r_start_latency,include/linux/ceph/osd_client.h +2
-3@@ -572,9 +572,8 @@ static inline int ceph_alloc_sparse_ext_map(struct ceph_osd_req_op *op)extern void ceph_osdc_get_request (struct ceph_osd_request *req);extern void ceph_osdc_put_request (struct ceph_osd_request *req); -extern int ceph_osdc_start_request (struct ceph_osd_client *osdc, -struct ceph_osd_request *req, -bool nofail); +void ceph_osdc_start_request (struct ceph_osd_client *osdc, +struct ceph_osd_request *req);extern void ceph_osdc_cancel_request (struct ceph_osd_request *req);extern int ceph_osdc_wait_request (struct ceph_osd_client *osdc,struct ceph_osd_request *req);net/ceph/osd_client.c +5
-8@@ -4615,15 +4615,12 @@ static void handle_watch_notify(struct ceph_osd_client *osdc,/* * Register request, send initial attempt. */ -int ceph_osdc_start_request (struct ceph_osd_client *osdc, -struct ceph_osd_request *req, -bool nofail) +void ceph_osdc_start_request (struct ceph_osd_client *osdc, +struct ceph_osd_request *req) {down_read (&osdc->lock);submit_request (req, false);up_read (&osdc->lock); - -return 0 ; }EXPORT_SYMBOL (ceph_osdc_start_request);@@ -4793,7 +4790,7 @@ int ceph_osdc_unwatch(struct ceph_osd_client *osdc,if (ret) goto out_put_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req);linger_cancel (lreq);linger_put (lreq); ret =wait_request_timeout (req, opts->mount_timeout);@@ -4864,7 +4861,7 @@ int ceph_osdc_notify_ack(struct ceph_osd_client *osdc,if (ret) goto out_put_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req); out_put_req:@@ -5080,7 +5077,7 @@ int ceph_osdc_list_watchers(struct ceph_osd_client *osdc,if (ret) goto out_put_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req);if (ret >=0 ) {void *p =page_address (pages[0 ]);
net/ceph/osd_client.c int ceph_osdc_call(struct ceph_osd_client *osdc, · line 5160
Quoted 8 lines
net/ceph/osd_client.c +1
-1@@ -5157,7 +5154,7 @@ int ceph_osdc_call(struct ceph_osd_client *osdc,if (ret) goto out_put_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req);if (ret >=0 ) { ret = req->r_ops[0 ].rval;
Looks good.
Will merge to the testing branch and test it.
Thanks Jeff!
-- Xiubo
Ilya Dryomov
maintainerQuoted 49 lines · Jeff Layton
This function always returns 0, and ignores the nofail boolean. Drop the nofail argument, make the function void return and fix up the callers.
Signed-off-by Jeff Layton <[email protected]>--- drivers/block/rbd.c | 6 +++--- fs/ceph/addr.c | 32 ++++++++++++-------------------- fs/ceph/file.c | 32 +++++++++++++------------------- include/linux/ceph/osd_client.h | 5 ++--- net/ceph/osd_client.c | 15 ++++++--------- 5 files changed, 36 insertions(+), 54 deletions(-)drivers/block/rbd.c +3
-3@@ -1297,7 +1297,7 @@ static void rbd_osd_submit(struct ceph_osd_request *osd_req)dout ("%s osd_req %p for obj_req %p objno %llu %llu~%llu\n" , __func__, osd_req, obj_req, obj_req->ex.oe_objno, obj_req->ex.oe_off, obj_req->ex.oe_len); -ceph_osdc_start_request (osd_req->r_osdc, osd_req, false); +ceph_osdc_start_request (osd_req->r_osdc, osd_req); }/* @@ -2081,7 +2081,7 @@ static int rbd_object_map_update(struct rbd_obj_request *obj_req, u64 snap_id,if (ret)return ret; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req);return 0 ; }@@ -4768,7 +4768,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,if (ret) goto out_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req);if (ret >=0 )ceph_copy_from_page_vector (pages, buf,0 , ret);fs/ceph/addr.c +0
-0
fs/ceph/addr.c static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) · line 363
Quoted 10 lines
fs/ceph/addr.c +1
-3@@ -357,9 +357,7 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) req->r_inode = inode;ihold (inode); - err =ceph_osdc_start_request (req->r_osdc, req, false); -if (err) -iput (inode); +ceph_osdc_start_request (req->r_osdc, req); out:ceph_osdc_put_request (req);if (err)
Hi Jeff,
I'm confused by this err != 0 check. Previously err was set to 0 by ceph_osdc_start_request() and netfs_subreq_terminated() was never called after an OSD request submission. Now it is called, but only if len != 0?
I see that netfs_subreq_terminated() accepts either the amount of data transferred or an error code but it also has some transferred_or_error == 0 handling which this check effectively disables. And do we really want to account for transferred data before the transfer occurs?
Thanks,
Ilya
Quoted 68 lines · Ilya Dryomov
Quoted 49 lines · Jeff Layton
This function always returns 0, and ignores the nofail boolean. Drop the nofail argument, make the function void return and fix up the callers.
Signed-off-by Jeff Layton <[email protected]>--- drivers/block/rbd.c | 6 +++--- fs/ceph/addr.c | 32 ++++++++++++-------------------- fs/ceph/file.c | 32 +++++++++++++------------------- include/linux/ceph/osd_client.h | 5 ++--- net/ceph/osd_client.c | 15 ++++++--------- 5 files changed, 36 insertions(+), 54 deletions(-)drivers/block/rbd.c +3
-3@@ -1297,7 +1297,7 @@ static void rbd_osd_submit(struct ceph_osd_request *osd_req)dout ("%s osd_req %p for obj_req %p objno %llu %llu~%llu\n" , __func__, osd_req, obj_req, obj_req->ex.oe_objno, obj_req->ex.oe_off, obj_req->ex.oe_len); -ceph_osdc_start_request (osd_req->r_osdc, osd_req, false); +ceph_osdc_start_request (osd_req->r_osdc, osd_req); }/* @@ -2081,7 +2081,7 @@ static int rbd_object_map_update(struct rbd_obj_request *obj_req, u64 snap_id,if (ret)return ret; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req);return 0 ; }@@ -4768,7 +4768,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,if (ret) goto out_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req);if (ret >=0 )ceph_copy_from_page_vector (pages, buf,0 , ret);fs/ceph/addr.c +0
-0fs/ceph/addr.c static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) · line 363
Quoted 10 lines
fs/ceph/addr.c +1
-3@@ -357,9 +357,7 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) req->r_inode = inode;ihold (inode); - err =ceph_osdc_start_request (req->r_osdc, req, false); -if (err) -iput (inode); +ceph_osdc_start_request (req->r_osdc, req); out:ceph_osdc_put_request (req);if (err)Hi Jeff,
I'm confused by this err != 0 check. Previously err was set to 0 by
ceph_osdc_start_request()andnetfs_subreq_terminated()was never called after an OSD request submission. Now it is called, but only if len != 0?
Quoted 5 lines
I see that
netfs_subreq_terminated()accepts either the amount of data transferred or an error code but it also has sometransferred_or_error== 0 handling which this check effectively disables. And do we really want to account for transferred data before the transfer occurs?
No we don't. I think you're correct. What I'm not sure of is why this doesn't cause test failures all over the place.
In any case, I'll need to respin this. I'll do that and send a v2.
Good catch!
Signature · 1 line
Jeff Layton <[email protected]>
Ilya Dryomov
maintainerQuoted 70 lines · Jeff Layton
Quoted 68 lines · Ilya Dryomov
Quoted 49 lines · Jeff Layton
This function always returns 0, and ignores the nofail boolean. Drop the nofail argument, make the function void return and fix up the callers.
Signed-off-by Jeff Layton <[email protected]>--- drivers/block/rbd.c | 6 +++--- fs/ceph/addr.c | 32 ++++++++++++-------------------- fs/ceph/file.c | 32 +++++++++++++------------------- include/linux/ceph/osd_client.h | 5 ++--- net/ceph/osd_client.c | 15 ++++++--------- 5 files changed, 36 insertions(+), 54 deletions(-)drivers/block/rbd.c +3
-3@@ -1297,7 +1297,7 @@ static void rbd_osd_submit(struct ceph_osd_request *osd_req)dout ("%s osd_req %p for obj_req %p objno %llu %llu~%llu\n" , __func__, osd_req, obj_req, obj_req->ex.oe_objno, obj_req->ex.oe_off, obj_req->ex.oe_len); -ceph_osdc_start_request (osd_req->r_osdc, osd_req, false); +ceph_osdc_start_request (osd_req->r_osdc, osd_req); }/* @@ -2081,7 +2081,7 @@ static int rbd_object_map_update(struct rbd_obj_request *obj_req, u64 snap_id,if (ret)return ret; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req);return 0 ; }@@ -4768,7 +4768,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,if (ret) goto out_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req);if (ret >=0 )ceph_copy_from_page_vector (pages, buf,0 , ret);fs/ceph/addr.c +0
-0fs/ceph/addr.c static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) · line 363
Quoted 10 lines
fs/ceph/addr.c +1
-3@@ -357,9 +357,7 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) req->r_inode = inode;ihold (inode); - err =ceph_osdc_start_request (req->r_osdc, req, false); -if (err) -iput (inode); +ceph_osdc_start_request (req->r_osdc, req); out:ceph_osdc_put_request (req);if (err)Hi Jeff,
I'm confused by this err != 0 check. Previously err was set to 0 by
ceph_osdc_start_request()andnetfs_subreq_terminated()was never called after an OSD request submission. Now it is called, but only if len != 0?
Quoted 8 lines
Quoted 5 lines
I see that
netfs_subreq_terminated()accepts either the amount of data transferred or an error code but it also has sometransferred_or_error== 0 handling which this check effectively disables. And do we really want to account for transferred data before the transfer occurs?No we don't. I think you're correct. What I'm not sure of is why this doesn't cause test failures all over the place.
This is due to "libceph: add new iov_iter-based ceph_msg_data_type and ceph_osd_data_type" and "ceph: use osd_req_op_extent_osd_iter for netfs reads" end up fixing it later by removing iov_iter_get_pages_alloc() call. I think because these commits were backed out of testing at one point and re-added later, the order got messed up by accident.
Thanks,
Ilya
Quoted 77 lines · Ilya Dryomov
Quoted 76 lines · Jeff Layton
Quoted 73 lines · Ilya Dryomov
Quoted 49 lines · Jeff Layton
This function always returns 0, and ignores the nofail boolean. Drop the nofail argument, make the function void return and fix up the callers.
Signed-off-by Jeff Layton <[email protected]>--- drivers/block/rbd.c | 6 +++--- fs/ceph/addr.c | 32 ++++++++++++-------------------- fs/ceph/file.c | 32 +++++++++++++------------------- include/linux/ceph/osd_client.h | 5 ++--- net/ceph/osd_client.c | 15 ++++++--------- 5 files changed, 36 insertions(+), 54 deletions(-)drivers/block/rbd.c +3
-3@@ -1297,7 +1297,7 @@ static void rbd_osd_submit(struct ceph_osd_request *osd_req)dout ("%s osd_req %p for obj_req %p objno %llu %llu~%llu\n" , __func__, osd_req, obj_req, obj_req->ex.oe_objno, obj_req->ex.oe_off, obj_req->ex.oe_len); -ceph_osdc_start_request (osd_req->r_osdc, osd_req, false); +ceph_osdc_start_request (osd_req->r_osdc, osd_req); }/* @@ -2081,7 +2081,7 @@ static int rbd_object_map_update(struct rbd_obj_request *obj_req, u64 snap_id,if (ret)return ret; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req);return 0 ; }@@ -4768,7 +4768,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,if (ret) goto out_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req);if (ret >=0 )ceph_copy_from_page_vector (pages, buf,0 , ret);fs/ceph/addr.c +0
-0fs/ceph/addr.c static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) · line 363
Quoted 10 lines
fs/ceph/addr.c +1
-3@@ -357,9 +357,7 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) req->r_inode = inode;ihold (inode); - err =ceph_osdc_start_request (req->r_osdc, req, false); -if (err) -iput (inode); +ceph_osdc_start_request (req->r_osdc, req); out:ceph_osdc_put_request (req);if (err)Hi Jeff,
I'm confused by this err != 0 check. Previously err was set to 0 by
ceph_osdc_start_request()andnetfs_subreq_terminated()was never called after an OSD request submission. Now it is called, but only if len != 0?I see that
netfs_subreq_terminated()accepts either the amount of data transferred or an error code but it also has sometransferred_or_error== 0 handling which this check effectively disables. And do we really want to account for transferred data before the transfer occurs?
Quoted 9 lines
Quoted 2 lines
No we don't. I think you're correct. What I'm not sure of is why this doesn't cause test failures all over the place.
This is due to "libceph: add new iov_iter-based
ceph_msg_data_typeandceph_osd_data_type" and "ceph: useosd_req_op_extent_osd_iterfor netfs reads" end up fixing it later by removingiov_iter_get_pages_alloc()call. I think because these commits were backed out of testing at one point and re-added later, the order got messed up by accident.
Yep, that's the reason. Would you mind folding the one-line fix into the original patch, or would you rather I send a v2?
Thanks,
Signature · 1 line
Jeff Layton <[email protected]>
Ilya Dryomov
maintainerQuoted 89 lines · Jeff Layton
Quoted 77 lines · Ilya Dryomov
Quoted 76 lines · Jeff Layton
Quoted 73 lines · Ilya Dryomov
Quoted 49 lines · Jeff Layton
This function always returns 0, and ignores the nofail boolean. Drop the nofail argument, make the function void return and fix up the callers.
Signed-off-by Jeff Layton <[email protected]>--- drivers/block/rbd.c | 6 +++--- fs/ceph/addr.c | 32 ++++++++++++-------------------- fs/ceph/file.c | 32 +++++++++++++------------------- include/linux/ceph/osd_client.h | 5 ++--- net/ceph/osd_client.c | 15 ++++++--------- 5 files changed, 36 insertions(+), 54 deletions(-)drivers/block/rbd.c +3
-3@@ -1297,7 +1297,7 @@ static void rbd_osd_submit(struct ceph_osd_request *osd_req)dout ("%s osd_req %p for obj_req %p objno %llu %llu~%llu\n" , __func__, osd_req, obj_req, obj_req->ex.oe_objno, obj_req->ex.oe_off, obj_req->ex.oe_len); -ceph_osdc_start_request (osd_req->r_osdc, osd_req, false); +ceph_osdc_start_request (osd_req->r_osdc, osd_req); }/* @@ -2081,7 +2081,7 @@ static int rbd_object_map_update(struct rbd_obj_request *obj_req, u64 snap_id,if (ret)return ret; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req);return 0 ; }@@ -4768,7 +4768,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,if (ret) goto out_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req);if (ret >=0 )ceph_copy_from_page_vector (pages, buf,0 , ret);fs/ceph/addr.c +0
-0fs/ceph/addr.c static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) · line 363
Quoted 10 lines
fs/ceph/addr.c +1
-3@@ -357,9 +357,7 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) req->r_inode = inode;ihold (inode); - err =ceph_osdc_start_request (req->r_osdc, req, false); -if (err) -iput (inode); +ceph_osdc_start_request (req->r_osdc, req); out:ceph_osdc_put_request (req);if (err)Hi Jeff,
I'm confused by this err != 0 check. Previously err was set to 0 by
ceph_osdc_start_request()andnetfs_subreq_terminated()was never called after an OSD request submission. Now it is called, but only if len != 0?I see that
netfs_subreq_terminated()accepts either the amount of data transferred or an error code but it also has sometransferred_or_error== 0 handling which this check effectively disables. And do we really want to account for transferred data before the transfer occurs?Quoted 9 lines
Quoted 2 lines
No we don't. I think you're correct. What I'm not sure of is why this doesn't cause test failures all over the place.
This is due to "libceph: add new iov_iter-based
ceph_msg_data_typeandceph_osd_data_type" and "ceph: useosd_req_op_extent_osd_iterfor netfs reads" end up fixing it later by removingiov_iter_get_pages_alloc()call. I think because these commits were backed out of testing at one point and re-added later, the order got messed up by accident.
Quoted 2 lines
Yep, that's the reason. Would you mind folding the one-line fix into the original patch, or would you rather I send a v2?
I already did as it seemed obviously correct to me. I also made sure that the fixed up patch would run through fs suite without any follow up patches, just in case.
Thanks for jumping in on this!
Ilya
Quoted 68 lines · Ilya Dryomov
Quoted 49 lines · Jeff Layton
This function always returns 0, and ignores the nofail boolean. Drop the nofail argument, make the function void return and fix up the callers.
Signed-off-by Jeff Layton <[email protected]>--- drivers/block/rbd.c | 6 +++--- fs/ceph/addr.c | 32 ++++++++++++-------------------- fs/ceph/file.c | 32 +++++++++++++------------------- include/linux/ceph/osd_client.h | 5 ++--- net/ceph/osd_client.c | 15 ++++++--------- 5 files changed, 36 insertions(+), 54 deletions(-)drivers/block/rbd.c +3
-3@@ -1297,7 +1297,7 @@ static void rbd_osd_submit(struct ceph_osd_request *osd_req)dout ("%s osd_req %p for obj_req %p objno %llu %llu~%llu\n" , __func__, osd_req, obj_req, obj_req->ex.oe_objno, obj_req->ex.oe_off, obj_req->ex.oe_len); -ceph_osdc_start_request (osd_req->r_osdc, osd_req, false); +ceph_osdc_start_request (osd_req->r_osdc, osd_req); }/* @@ -2081,7 +2081,7 @@ static int rbd_object_map_update(struct rbd_obj_request *obj_req, u64 snap_id,if (ret)return ret; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req);return 0 ; }@@ -4768,7 +4768,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,if (ret) goto out_req; -ceph_osdc_start_request (osdc, req, false); +ceph_osdc_start_request (osdc, req); ret =ceph_osdc_wait_request (osdc, req);if (ret >=0 )ceph_copy_from_page_vector (pages, buf,0 , ret);fs/ceph/addr.c +0
-0fs/ceph/addr.c static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) · line 363
Quoted 10 lines
fs/ceph/addr.c +1
-3@@ -357,9 +357,7 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) req->r_inode = inode;ihold (inode); - err =ceph_osdc_start_request (req->r_osdc, req, false); -if (err) -iput (inode); +ceph_osdc_start_request (req->r_osdc, req); out:ceph_osdc_put_request (req);if (err)Hi Jeff,
I'm confused by this err != 0 check. Previously err was set to 0 by
ceph_osdc_start_request()andnetfs_subreq_terminated()was never called after an OSD request submission. Now it is called, but only if len != 0?
Quoted 8 lines
I see that
netfs_subreq_terminated()accepts either the amount of data transferred or an error code but it also has sometransferred_or_error== 0 handling which this check effectively disables. And do we really want to account for transferred data before the transfer occurs?Thanks,
Ilya
The incremental "patch to the patch" is here:
fs/ceph/addr.c +1 -0
@@ -337,6 +337,7 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)/* should always give us a page-aligned read */ WARN_ON_ONCE (page_off); len = err; + err =0 ;osd_req_op_extent_osd_data_pages (req,0 , pages, len,0 , false, false); req->r_callback = finish_netfs_read;
I'll need to rebuild my test environment to make sure this is working as expected.
Signature · 1 line
Jeff Layton <[email protected]>