diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:28 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:28 -0700 |
commit | d831fd1b46d04e5c8c8a0431c321578d25852695 (patch) | |
tree | 53a685712d0f0debe66de80c1f0a5e545d0de7e2 /include/linux/ceph/messenger.h | |
parent | c95c4e2a6bb8d44f9a8f59eadd99a9a615c53112 (diff) | |
parent | 339f8f37f0203884332585e38c06536c8477d475 (diff) |
Merge tag 'v3.10.55' into linux-linaro-lsklsk-v3.10-14.09
This is the 3.10.55 stable release
Diffstat (limited to 'include/linux/ceph/messenger.h')
-rw-r--r-- | include/linux/ceph/messenger.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index 7c1420bb1dce..6ade97de7a85 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h @@ -157,7 +157,7 @@ struct ceph_msg { bool front_is_vmalloc; bool more_to_follow; bool needs_out_seq; - int front_max; + int front_alloc_len; unsigned long ack_stamp; /* tx: when we were acked */ struct ceph_msgpool *pool; |