projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pinctrl-v4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[deliverable/linux.git]
/
fs
/
jbd2
/
journal.c
diff --git
a/fs/jbd2/journal.c
b/fs/jbd2/journal.c
index de73a9516a542af75ac8bcf8aa6faa0199af7b3f..435f0b26ac2038e4f8037b5b1f2e4d15dbc9b2d2 100644
(file)
--- a/
fs/jbd2/journal.c
+++ b/
fs/jbd2/journal.c
@@
-2221,7
+2221,7
@@
void jbd2_journal_ack_err(journal_t *journal)
int jbd2_journal_blocks_per_page(struct inode *inode)
{
- return 1 << (PAGE_
CACHE_
SHIFT - inode->i_sb->s_blocksize_bits);
+ return 1 << (PAGE_SHIFT - inode->i_sb->s_blocksize_bits);
}
/*
This page took
0.026664 seconds
and
5
git commands to generate.