git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith...
[pandora-kernel.git]
/
net
/
ceph
/
osd_client.c
diff --git
a/net/ceph/osd_client.c
b/net/ceph/osd_client.c
index
5a80f41
..
6b5dda1
100644
(file)
--- a/
net/ceph/osd_client.c
+++ b/
net/ceph/osd_client.c
@@
-470,8
+470,8
@@
struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
snapc, ops,
use_mempool,
GFP_NOFS, NULL, NULL);
- if (
IS_ERR(req)
)
- return
req
;
+ if (
!req
)
+ return
NULL
;
/* calculate max write size */
calc_layout(osdc, vino, layout, off, plen, req, ops);