diff options
author | Chengguang Xu <cgxu519@gmx.com> | 2018-07-28 04:30:48 -0400 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2018-08-13 11:55:43 -0400 |
commit | d5548492902967dd088bd0a21df7d047df10f9f6 (patch) | |
tree | c85a955f709b18ed7ca966b50571362bcf64ce2e /fs/ceph | |
parent | 9da12e3a7de1665a14063653b60e872da0ee7810 (diff) |
ceph: change to void return type for __do_request()
We do not check return code for __do_request() in all callers,
so change to void return type.
Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/ceph')
-rw-r--r-- | fs/ceph/mds_client.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index dfbe138472e6..8dbfca01c7ea 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
@@ -2227,7 +2227,7 @@ static int __prepare_send_request(struct ceph_mds_client *mdsc, | |||
2227 | /* | 2227 | /* |
2228 | * send request, or put it on the appropriate wait list. | 2228 | * send request, or put it on the appropriate wait list. |
2229 | */ | 2229 | */ |
2230 | static int __do_request(struct ceph_mds_client *mdsc, | 2230 | static void __do_request(struct ceph_mds_client *mdsc, |
2231 | struct ceph_mds_request *req) | 2231 | struct ceph_mds_request *req) |
2232 | { | 2232 | { |
2233 | struct ceph_mds_session *session = NULL; | 2233 | struct ceph_mds_session *session = NULL; |
@@ -2237,7 +2237,7 @@ static int __do_request(struct ceph_mds_client *mdsc, | |||
2237 | if (req->r_err || test_bit(CEPH_MDS_R_GOT_RESULT, &req->r_req_flags)) { | 2237 | if (req->r_err || test_bit(CEPH_MDS_R_GOT_RESULT, &req->r_req_flags)) { |
2238 | if (test_bit(CEPH_MDS_R_ABORTED, &req->r_req_flags)) | 2238 | if (test_bit(CEPH_MDS_R_ABORTED, &req->r_req_flags)) |
2239 | __unregister_request(mdsc, req); | 2239 | __unregister_request(mdsc, req); |
2240 | goto out; | 2240 | return; |
2241 | } | 2241 | } |
2242 | 2242 | ||
2243 | if (req->r_timeout && | 2243 | if (req->r_timeout && |
@@ -2260,7 +2260,7 @@ static int __do_request(struct ceph_mds_client *mdsc, | |||
2260 | if (mdsc->mdsmap->m_epoch == 0) { | 2260 | if (mdsc->mdsmap->m_epoch == 0) { |
2261 | dout("do_request no mdsmap, waiting for map\n"); | 2261 | dout("do_request no mdsmap, waiting for map\n"); |
2262 | list_add(&req->r_wait, &mdsc->waiting_for_map); | 2262 | list_add(&req->r_wait, &mdsc->waiting_for_map); |
2263 | goto finish; | 2263 | return; |
2264 | } | 2264 | } |
2265 | if (!(mdsc->fsc->mount_options->flags & | 2265 | if (!(mdsc->fsc->mount_options->flags & |
2266 | CEPH_MOUNT_OPT_MOUNTWAIT) && | 2266 | CEPH_MOUNT_OPT_MOUNTWAIT) && |
@@ -2278,7 +2278,7 @@ static int __do_request(struct ceph_mds_client *mdsc, | |||
2278 | ceph_mdsmap_get_state(mdsc->mdsmap, mds) < CEPH_MDS_STATE_ACTIVE) { | 2278 | ceph_mdsmap_get_state(mdsc->mdsmap, mds) < CEPH_MDS_STATE_ACTIVE) { |
2279 | dout("do_request no mds or not active, waiting for map\n"); | 2279 | dout("do_request no mds or not active, waiting for map\n"); |
2280 | list_add(&req->r_wait, &mdsc->waiting_for_map); | 2280 | list_add(&req->r_wait, &mdsc->waiting_for_map); |
2281 | goto out; | 2281 | return; |
2282 | } | 2282 | } |
2283 | 2283 | ||
2284 | /* get, open session */ | 2284 | /* get, open session */ |
@@ -2328,8 +2328,7 @@ finish: | |||
2328 | complete_request(mdsc, req); | 2328 | complete_request(mdsc, req); |
2329 | __unregister_request(mdsc, req); | 2329 | __unregister_request(mdsc, req); |
2330 | } | 2330 | } |
2331 | out: | 2331 | return; |
2332 | return err; | ||
2333 | } | 2332 | } |
2334 | 2333 | ||
2335 | /* | 2334 | /* |