projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Driver: spi: fix compiling err for rk3288
[firefly-linux-kernel-4.4.55.git]
/
fs
/
mpage.c
diff --git
a/fs/mpage.c
b/fs/mpage.c
index 5c65d8942692fd468558c9cac0052216af75a2bb..f37bb01a333bb1a577cab35d35b21f0b18ba3939 100644
(file)
--- a/
fs/mpage.c
+++ b/
fs/mpage.c
@@
-79,11
+79,17
@@
static struct bio *mpage_bio_submit(int rw, struct bio *bio)
struct page *first_page = bio->bi_io_vec[0].bv_page;
if (first_page != NULL) {
struct page *first_page = bio->bi_io_vec[0].bv_page;
if (first_page != NULL) {
+ char *path, pathbuf[MAX_TRACE_PATHBUF_LEN];
+
+ path = android_fstrace_get_pathname(pathbuf,
+ MAX_TRACE_PATHBUF_LEN,
+ first_page->mapping->host);
trace_android_fs_dataread_start(
first_page->mapping->host,
page_offset(first_page),
bio->bi_iter.bi_size,
current->pid,
trace_android_fs_dataread_start(
first_page->mapping->host,
page_offset(first_page),
bio->bi_iter.bi_size,
current->pid,
+ path,
current->comm);
}
}
current->comm);
}
}
@@
-141,7
+147,7
@@
map_buffer_to_page(struct page *page, struct buffer_head *bh, int page_block)
SetPageUptodate(page);
return;
}
SetPageUptodate(page);
return;
}
- create_empty_buffers(page,
1 << inode->i_blkbits
, 0);
+ create_empty_buffers(page,
i_blocksize(inode)
, 0);
}
head = page_buffers(page);
page_bh = head;
}
head = page_buffers(page);
page_bh = head;