GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 18:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

libceph: make ceph_osdc_put_request() accept NULL

Browse source 
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2016-04-26 15:05:29 +02:00
parent 663ae2cc04
commit 3ed97d6345
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fs/ceph/addr.c
View file

@ -1099,7 +1099,6 @@ release_pvec_pages:
mapping->writeback_index = index; mapping->writeback_index = index;
out: out:
if (req)
ceph_osdc_put_request(req); ceph_osdc_put_request(req);
ceph_put_snap_context(snapc); ceph_put_snap_context(snapc);
dout("writepages done, rc = %d\n", rc); dout("writepages done, rc = %d\n", rc);
@ -1824,9 +1823,7 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci, u32 pool)
out_unlock: out_unlock:
up_write(&mdsc->pool_perm_rwsem); up_write(&mdsc->pool_perm_rwsem);
if (rd_req)
ceph_osdc_put_request(rd_req); ceph_osdc_put_request(rd_req);
if (wr_req)
ceph_osdc_put_request(wr_req); ceph_osdc_put_request(wr_req);
out: out:
if (!err) if (!err)

2
net/ceph/osd_client.c
View file

@ -354,10 +354,12 @@ EXPORT_SYMBOL(ceph_osdc_get_request);
void ceph_osdc_put_request(struct ceph_osd_request *req) void ceph_osdc_put_request(struct ceph_osd_request *req)
{ {
if (req) {
dout("%s %p (was %d)\n", __func__, req, dout("%s %p (was %d)\n", __func__, req,
atomic_read(&req->r_kref.refcount)); atomic_read(&req->r_kref.refcount));
kref_put(&req->r_kref, ceph_osdc_release_request); kref_put(&req->r_kref, ceph_osdc_release_request);
} }
}
EXPORT_SYMBOL(ceph_osdc_put_request); EXPORT_SYMBOL(ceph_osdc_put_request);
struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,