summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGioh Kim <gioh.kim@lge.com>2014-09-04 22:36:35 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-09-04 22:36:35 -0400
commita49058fab2912296f068759490ac69ba43b43861 (patch)
treee3e9d475166a70128c9d26bd5f1aa64f7a757be1
parenta8ac900b8163703340a2fdad11c32f96b8fe686d (diff)
downloadtalos-op-linux-a49058fab2912296f068759490ac69ba43b43861.tar.gz
talos-op-linux-a49058fab2912296f068759490ac69ba43b43861.zip
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.c2
-rw-r--r--fs/jbd2/journal.c2
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)
goto out_err;
}
- bh = __getblk(journal->j_dev, blocknr, journal->j_blocksize);
+ bh = getblk_unmovable(journal->j_dev, blocknr, journal->j_blocksize);
if (!bh) {
printk(KERN_ERR
"%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)
goto out_err;
}
- bh = __getblk(journal->j_dev, blocknr, journal->j_blocksize);
+ bh = getblk_unmovable(journal->j_dev, blocknr, journal->j_blocksize);
if (!bh) {
printk(KERN_ERR
"%s: Cannot get buffer for journal superblock\n",
OpenPOWER on IntegriCloud