diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-20 16:27:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-20 16:27:58 -0700 |
| commit | e0959371b4aaddb9b986019d5cfef93f9801d0ff (patch) | |
| tree | 7df35d0e8dc8de31fa19aa0f8f3fad78b2afea11 /fs/ceph/mds_client.h | |
| parent | 83ba37105e262d374b9092a572b8ee6e30aa9f70 (diff) | |
| parent | e979cf50395e24c4bdd489f60e2d5dd5ae66d255 (diff) | |
| download | talos-obmc-linux-e0959371b4aaddb9b986019d5cfef93f9801d0ff.tar.gz talos-obmc-linux-e0959371b4aaddb9b986019d5cfef93f9801d0ff.zip | |
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: do not include cap/dentry releases in replayed messages
ceph: reuse request message when replaying against recovering mds
ceph: fix creation of ipv6 sockets
ceph: fix parsing of ipv6 addresses
ceph: fix printing of ipv6 addrs
ceph: add kfree() to error path
ceph: fix leak of mon authorizer
ceph: fix message revocation
Diffstat (limited to 'fs/ceph/mds_client.h')
| -rw-r--r-- | fs/ceph/mds_client.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h index b292fa42a66d..952410c60d09 100644 --- a/fs/ceph/mds_client.h +++ b/fs/ceph/mds_client.h @@ -188,6 +188,7 @@ struct ceph_mds_request { int r_old_inode_drop, r_old_inode_unless; struct ceph_msg *r_request; /* original request */ + int r_request_release_offset; struct ceph_msg *r_reply; struct ceph_mds_reply_info_parsed r_reply_info; int r_err; |
