Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-18 11:23:37 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-18 11:23:37 +0200
commitcf8ea3b2a4af7ea768d959647bb1587dd2e8bd15 (patch)
tree41de459f8d70ac44e6fbe58381c6f48b3ab9a9ac
parent3b6f57e3a2f885f469a415a73740d60d74079b56 (diff)
parent4cd44aa7c0864138019e38626beb5823238ac072 (diff)
Merge branch 'users/mgorman/SLE15/for-next' into SLE15
Pull mm fix from Mel Gorman suse-commit: a8aa0aac4c92ecd178f88c84453883467e8589e8
-rw-r--r--mm/migrate.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c
index a157d67877c5..42ec22a3c2c0 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -763,12 +763,12 @@ recheck_buffers:
}
bh = bh->b_this_page;
} while (bh != head);
- spin_unlock(&mapping->private_lock);
if (busy) {
if (invalidated) {
rc = -EAGAIN;
goto unlock_buffers;
}
+ spin_unlock(&mapping->private_lock);
invalidate_bh_lrus();
invalidated = true;
goto recheck_buffers;
@@ -801,6 +801,8 @@ recheck_buffers:
rc = MIGRATEPAGE_SUCCESS;
unlock_buffers:
+ if (check_refs)
+ spin_unlock(&mapping->private_lock);
bh = head;
do {
unlock_buffer(bh);