From: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Date: Tue, 1 Apr 2014 08:38:26 +0000 (+0900)
Subject: f2fs: return -EIO when node id is not matched
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3bb5e2c8fe2296ddd9d864dcfb5ee1b77135f3ec;p=deliverable%2Flinux.git

f2fs: return -EIO when node id is not matched

During the cleaing of node segments, F2FS can get errored node blocks due to
data race between node page lock and its valid bitmap operations.
In that case, it needs to return an error to skip such the obsolete block copy.

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
---

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index eced8d7bf502..065cd99cc723 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -958,7 +958,7 @@ repeat:
 		goto got_it;
 
 	lock_page(page);
-	if (unlikely(!PageUptodate(page))) {
+	if (unlikely(!PageUptodate(page) || nid != nid_of_node(page))) {
 		f2fs_put_page(page, 1);
 		return ERR_PTR(-EIO);
 	}
@@ -967,7 +967,6 @@ repeat:
 		goto repeat;
 	}
 got_it:
-	f2fs_bug_on(nid != nid_of_node(page));
 	mark_page_accessed(page);
 	return page;
 }