ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit '87998c07a325d8cfa7517516edac7173dbea63bf':
  Move sdcard off PAGESIZE and onto PAGE_SIZE.
This commit is contained in:
Elliott Hughes 2015-07-29 00:04:50 +00:00 • committed by Android Git Automerger
commit 07bed1941f
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

@ -264,7 +264,7 @@ struct fuse_handler {
* buffer at the same time. This allows us to share the underlying storage. */ * buffer at the same time. This allows us to share the underlying storage. */
union { union {
__u8 request_buffer[MAX_REQUEST_SIZE]; __u8 request_buffer[MAX_REQUEST_SIZE];
__u8 read_buffer[MAX_READ + PAGESIZE]; __u8 read_buffer[MAX_READ + PAGE_SIZE];
}; };
}; };
@ -1282,7 +1282,7 @@ static int handle_read(struct fuse* fuse, struct fuse_handler* handler,
__u32 size = req->size; __u32 size = req->size;
__u64 offset = req->offset; __u64 offset = req->offset;
int res; 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 /* 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 * overlaps the request buffer and will clobber data in the request. This
@ -1308,7 +1308,7 @@ static int handle_write(struct fuse* fuse, struct fuse_handler* handler,
struct fuse_write_out out; struct fuse_write_out out;
struct handle *h = id_to_ptr(req->fh); struct handle *h = id_to_ptr(req->fh);
int res; int res;
__u8 aligned_buffer[req->size] __attribute__((__aligned__(PAGESIZE))); __u8 aligned_buffer[req->size] __attribute__((__aligned__(PAGE_SIZE)));
if (req->flags & O_DIRECT) { if (req->flags & O_DIRECT) {
memcpy(aligned_buffer, buffer, req->size); memcpy(aligned_buffer, buffer, req->size);