1 files changed, 4 insertions, 9 deletions

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index dd47026c6064..146ac9040141 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -526,15 +526,10 @@ more:
         io_align = pos & ~PAGE_MASK;
         buf_align = (unsigned long)data & ~PAGE_MASK;
         len = left;
-        if (file->f_flags & O_DIRECT) {
-                /* write from beginning of first page, regardless of
-                   io alignment */
-                page_align = (pos - io_align + buf_align) & ~PAGE_MASK;
-                num_pages = calc_pages_for((unsigned long)data, len);
-        } else {
-                page_align = pos & ~PAGE_MASK;
-                num_pages = calc_pages_for(pos, len);
-        }
+
+        /* write from beginning of first page, regardless of io alignment */
+        page_align = file->f_flags & O_DIRECT ? buf_align : io_align;
+        num_pages = calc_pages_for(page_align, len);
         req = ceph_osdc_new_request(&fsc->client->osdc, &ci->i_layout,
                                     ceph_vino(inode), pos, &len,
                                     CEPH_OSD_OP_WRITE, flags,