diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-19 02:01:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-19 02:01:55 -0400 |
| commit | 2ec8c6bb5d8f3a62a79f463525054bae1e3d4487 (patch) | |
| tree | fa7f8400ac685fb52e96f64997c7c682fc2aa021 /fs/ceph/messenger.h | |
| parent | 7b39f90fabcf9e2af0cd79d0a60440d821e22b56 (diff) | |
| parent | 537b60d17894b7c19a6060feae40299d7109d6e7 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/linux/mod_devicetable.h
scripts/mod/file2alias.c
Diffstat (limited to 'fs/ceph/messenger.h')
| -rw-r--r-- | fs/ceph/messenger.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/messenger.h b/fs/ceph/messenger.h index a343dae73cdc..a5caf91cc971 100644 --- a/fs/ceph/messenger.h +++ b/fs/ceph/messenger.h | |||
| @@ -86,6 +86,7 @@ struct ceph_msg { | |||
| 86 | struct kref kref; | 86 | struct kref kref; |
| 87 | bool front_is_vmalloc; | 87 | bool front_is_vmalloc; |
| 88 | bool more_to_follow; | 88 | bool more_to_follow; |
| 89 | bool needs_out_seq; | ||
| 89 | int front_max; | 90 | int front_max; |
| 90 | 91 | ||
| 91 | struct ceph_msgpool *pool; | 92 | struct ceph_msgpool *pool; |