diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-09 23:03:46 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-09 23:03:46 +0400 |
| commit | 8dc54e49ce67e5628bf4668c64203c22cbac7fc5 (patch) | |
| tree | 12f25a8dd312683abc3deafe4e41301e04b66ad3 /fs/ceph/osd_client.c | |
| parent | 267aeb6c142b1fbad1e6ed49f46d82113339141a (diff) | |
| parent | d91f2438d881514e4a923fd786dbd94b764a9440 (diff) | |
| download | linux-8dc54e49ce67e5628bf4668c64203c22cbac7fc5.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: update issue_seq on cap grant
ceph: send cap release message early on failed revoke.
ceph: Update max_len with minimum required size
ceph: Fix return value of encode_fh function
ceph: avoid null deref in osd request error path
ceph: fix list_add usage on unsafe_writes list
Diffstat (limited to 'fs/ceph/osd_client.c')
| -rw-r--r-- | fs/ceph/osd_client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c index dfced1dacbcd..3b5571b8ce22 100644 --- a/fs/ceph/osd_client.c +++ b/fs/ceph/osd_client.c @@ -549,7 +549,7 @@ static void __unregister_request(struct ceph_osd_client *osdc, */ static void __cancel_request(struct ceph_osd_request *req) { - if (req->r_sent) { + if (req->r_sent && req->r_osd) { ceph_con_revoke(&req->r_osd->o_con, req->r_request); req->r_sent = 0; } |