diff options
author | Sage Weil <sage@newdream.net> | 2010-11-09 12:40:00 -0800 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-11-09 12:43:17 -0800 |
commit | c5c6b19d4b8f5431fca05f28ae9e141045022149 (patch) | |
tree | 0961d9aeee49f481134089ac5b93b7118cf3a34b /include | |
parent | b7495fc2ff941db6a118a93ab8d61149e3f4cef8 (diff) | |
download | kernel_samsung_smdk4412-c5c6b19d4b8f5431fca05f28ae9e141045022149.zip kernel_samsung_smdk4412-c5c6b19d4b8f5431fca05f28ae9e141045022149.tar.gz kernel_samsung_smdk4412-c5c6b19d4b8f5431fca05f28ae9e141045022149.tar.bz2 |
ceph: explicitly specify page alignment in network messages
The alignment used for reading data into or out of pages used to be taken
from the data_off field in the message header. This only worked as long
as the page alignment matched the object offset, breaking direct io to
non-page aligned offsets.
Instead, explicitly specify the page alignment next to the page vector
in the ceph_msg struct, and use that instead of the message header (which
probably shouldn't be trusted). The alloc_msg callback is responsible for
filling in this field properly when it sets up the page vector.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'include')
-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 5956d62..a108b42 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; |