GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 10:01:25 +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

9
fs/ceph/addr.c
View file

@ -1099,8 +1099,7 @@ 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);
return rc; return rc;
@ -1824,10 +1823,8 @@ 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); ceph_osdc_put_request(wr_req);
if (wr_req)
ceph_osdc_put_request(wr_req);
out: out:
if (!err) if (!err)
err = have; err = have;

8
net/ceph/osd_client.c
View file

@ -354,9 +354,11 @@ 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)
{ {
dout("%s %p (was %d)\n", __func__, req, if (req) {
atomic_read(&req->r_kref.refcount)); dout("%s %p (was %d)\n", __func__, req,
kref_put(&req->r_kref, ceph_osdc_release_request); atomic_read(&req->r_kref.refcount));
kref_put(&req->r_kref, ceph_osdc_release_request);
}
} }
EXPORT_SYMBOL(ceph_osdc_put_request); EXPORT_SYMBOL(ceph_osdc_put_request);