diff options
| author | Shaohua Li <shli@kernel.org> | 2012-04-13 10:27:35 +0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2012-04-23 21:43:41 -0400 |
| commit | 99aa78466777083255b876293e9e83dec7cd809a (patch) | |
| tree | e15bd88760cb27bb306929b19ba41abc53e0e333 | |
| parent | 57f73c2c89a5d3b2ed87201c8100d1fa989a1a65 (diff) | |
| download | linux-rpi-99aa78466777083255b876293e9e83dec7cd809a.tar.gz linux-rpi-99aa78466777083255b876293e9e83dec7cd809a.tar.bz2 linux-rpi-99aa78466777083255b876293e9e83dec7cd809a.zip | |
jbd2: use GFP_NOFS for blkdev_issue_flush
flush request is issued in transaction commit code path, so looks using
GFP_KERNEL to allocate memory for flush request bio falls into the classic
deadlock issue. I saw btrfs and dm get it right, but ext4, xfs and md are
using GFP.
Signed-off-by: Shaohua Li <shli@fusionio.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Cc: stable@vger.kernel.org
| -rw-r--r-- | fs/jbd2/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 806525a7269c..840f70f50792 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -723,7 +723,7 @@ start_journal_io: if (commit_transaction->t_need_data_flush && (journal->j_fs_dev != journal->j_dev) && (journal->j_flags & JBD2_BARRIER)) - blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL); + blkdev_issue_flush(journal->j_fs_dev, GFP_NOFS, NULL); /* Done it all: now write the commit record asynchronously. */ if (JBD2_HAS_INCOMPAT_FEATURE(journal, @@ -859,7 +859,7 @@ wait_for_iobuf: if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT) && journal->j_flags & JBD2_BARRIER) { - blkdev_issue_flush(journal->j_dev, GFP_KERNEL, NULL); + blkdev_issue_flush(journal->j_dev, GFP_NOFS, NULL); } if (err) |