openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 07bed194: am 87998c07: Merge "Move sdcard off PAGESIZE and onto PAGE_SIZE." 

* commit '07bed1941f902c1d65a410e49d33882e0da7b5ed':
  Move sdcard off PAGESIZE and onto PAGE_SIZE.
This commit is contained in:
Elliott Hughes 2015-07-29 00:19:16 +00:00 committed by Android Git Automerger
parent 60b662c300 07bed1941f
commit 4a1f0b51d8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdcard/sdcard.c
View File

@ -244,7 +244,7 @@ struct fuse_handler {
* buffer at the same time. This allows us to share the underlying storage. */
union {
__u8 request_buffer[MAX_REQUEST_SIZE];
__u8 read_buffer[MAX_READ + PAGESIZE];
__u8 read_buffer[MAX_READ + PAGE_SIZE];
};
};
@ -1212,7 +1212,7 @@ static int handle_read(struct fuse* fuse, struct fuse_handler* handler,
__u32 size = req->size;
__u64 offset = req->offset;
int res;
__u8 *read_buffer = (__u8 *) ((uintptr_t)(handler->read_buffer + PAGESIZE) & ~((uintptr_t)PAGESIZE-1));
__u8 *read_buffer = (__u8 *) ((uintptr_t)(handler->read_buffer + PAGE_SIZE) & ~((uintptr_t)PAGE_SIZE-1));
/* Don't access any other fields of hdr or req beyond this point, the read buffer
* overlaps the request buffer and will clobber data in the request. This
@ -1238,7 +1238,7 @@ static int handle_write(struct fuse* fuse, struct fuse_handler* handler,
struct fuse_write_out out;
struct handle *h = id_to_ptr(req->fh);
int res;
__u8 aligned_buffer[req->size] __attribute__((__aligned__(PAGESIZE)));
__u8 aligned_buffer[req->size] __attribute__((__aligned__(PAGE_SIZE)));
if (req->flags & O_DIRECT) {
memcpy(aligned_buffer, buffer, req->size);