commit 3b0c24e28d7538ff5b49a98eee99bac85c8e687b
author JP Abgrall <jpa@google.com> Wed Feb 19 20:30:24 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 19 20:30:25 2014 +0000
tree a08b0dcf8c3c8c2bdfd08316838f1fd3a3254cc5
parent 223e07983718e1515f2a54542b9b0163a8f508ed
parent 49e9344bddca3699c04f3da8c689d0f2b1a338b6

Merge "sdcard: direct I/O file access write buffer alignment"

sdcard/sdcard.c

diff --git a/sdcard/sdcard.c b/sdcard/sdcard.c
index 3bc8cd3..cb03316 100644
--- a/sdcard/sdcard.c
+++ b/sdcard/sdcard.c
@@ -1244,6 +1244,12 @@
     struct fuse_write_out out;
     struct handle *h = id_to_ptr(req->fh);
     int res;
+    __u8 aligned_buffer[req->size] __attribute__((__aligned__(PAGESIZE)));
+    
+    if (req->flags & O_DIRECT) {
+        memcpy(aligned_buffer, buffer, req->size);
+        buffer = (const __u8*) aligned_buffer;
+    }
 
     TRACE("[%d] WRITE %p(%d) %u@%llu\n", handler->token,
             h, h->fd, req->size, req->offset);