diff options
| author | Simon Horman | 2011-01-13 02:29:21 +0100 |
|---|---|---|
| committer | Simon Horman | 2011-01-13 02:29:21 +0100 |
| commit | fee1cc0895fd7bde875a86bbc3a1e82089e540b8 (patch) | |
| tree | df0a07a650229fd7aa775ca6c20a8d2939c96e72 /include/linux/ceph/messenger.h | |
| parent | netfilter: fix compilation when conntrack is disabled but tproxy is enabled (diff) | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/... (diff) | |
| download | kernel-qcow2-linux-fee1cc0895fd7bde875a86bbc3a1e82089e540b8.tar.gz kernel-qcow2-linux-fee1cc0895fd7bde875a86bbc3a1e82089e540b8.tar.xz kernel-qcow2-linux-fee1cc0895fd7bde875a86bbc3a1e82089e540b8.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into HEAD
Diffstat (limited to 'include/linux/ceph/messenger.h')
| -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 5956d62c3057..a108b425fee2 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h @@ -82,6 +82,7 @@ struct ceph_msg { struct ceph_buffer *middle; struct page **pages; /* data payload. NOT OWNER. */ unsigned nr_pages; /* size of page array */ + unsigned page_alignment; /* io offset in first page */ struct ceph_pagelist *pagelist; /* instead of pages */ struct list_head list_head; struct kref kref; |