diff options
author | Gioh Kim <gioh.kim@lge.com> | 2014-09-04 22:36:35 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2014-09-04 22:36:35 -0400 |
commit | a49058fab2912296f068759490ac69ba43b43861 (patch) | |
tree | e3e9d475166a70128c9d26bd5f1aa64f7a757be1 | |
parent | a8ac900b8163703340a2fdad11c32f96b8fe686d (diff) |
jbd/jbd2: use non-movable memory for the jbd superblock
Sicne the jbd/jbd2 superblock is not released until the file system is
unmounted, allocate the buffer cache from the non-moveable area to
allow page migration and CMA allocations to more easily succeed.
Signed-off-by: Gioh Kim <gioh.kim@lge.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
-rw-r--r-- | fs/jbd/journal.c | 2 | ||||
-rw-r--r-- | fs/jbd2/journal.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 06fe11e0abfa..aab8549591e7 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
@@ -886,7 +886,7 @@ journal_t * journal_init_inode (struct inode *inode) | |||
886 | goto out_err; | 886 | goto out_err; |
887 | } | 887 | } |
888 | 888 | ||
889 | bh = __getblk(journal->j_dev, blocknr, journal->j_blocksize); | 889 | bh = getblk_unmovable(journal->j_dev, blocknr, journal->j_blocksize); |
890 | if (!bh) { | 890 | if (!bh) { |
891 | printk(KERN_ERR | 891 | printk(KERN_ERR |
892 | "%s: Cannot get buffer for journal superblock\n", | 892 | "%s: Cannot get buffer for journal superblock\n", |
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 19d74d86d99c..415041c4c40c 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c | |||
@@ -1237,7 +1237,7 @@ journal_t * jbd2_journal_init_inode (struct inode *inode) | |||
1237 | goto out_err; | 1237 | goto out_err; |
1238 | } | 1238 | } |
1239 | 1239 | ||
1240 | bh = __getblk(journal->j_dev, blocknr, journal->j_blocksize); | 1240 | bh = getblk_unmovable(journal->j_dev, blocknr, journal->j_blocksize); |
1241 | if (!bh) { | 1241 | if (!bh) { |
1242 | printk(KERN_ERR | 1242 | printk(KERN_ERR |
1243 | "%s: Cannot get buffer for journal superblock\n", | 1243 | "%s: Cannot get buffer for journal superblock\n", |