diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /include/linux/ceph | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'include/linux/ceph')
| -rw-r--r-- | include/linux/ceph/messenger.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index 291aa6e18d31..ca768ae729b4 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h | |||
| @@ -93,6 +93,7 @@ struct ceph_msg { | |||
| 93 | bool more_to_follow; | 93 | bool more_to_follow; |
| 94 | bool needs_out_seq; | 94 | bool needs_out_seq; |
| 95 | int front_max; | 95 | int front_max; |
| 96 | unsigned long ack_stamp; /* tx: when we were acked */ | ||
| 96 | 97 | ||
| 97 | struct ceph_msgpool *pool; | 98 | struct ceph_msgpool *pool; |
| 98 | }; | 99 | }; |