commit da26b690243ac5c2a996537c415a8ec4aa520fa4
author Denton Gentry <dgentry@google.com> Sun Oct 11 19:58:03 2015 -0700
committer Denton Gentry <dgentry@google.com> Mon Oct 12 06:15:01 2015 -0700
tree 65f8b7eeb36c0e9efc66cbb20d0747efb5383692
parent 75db68cb1ea52170f4d9b57ee3ddf1eb0c512ace

ubifs: remount read-only on read error.

The filesystem can no longer be trusted, it needs to be
re-initialized by ubifsmonitor.

Resolves b/23289715.

Change-Id: Ibedd59650bf2144e6e62221709f81d8f20f356cf

fs/ubifs/file.c

diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index f9c234b..ea12250 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -160,6 +160,7 @@
 		addr += UBIFS_BLOCK_SIZE;
 	}
 	if (err) {
+		struct ubifs_info *c = inode->i_sb->s_fs_info;
 		if (err == -ENOENT) {
 			/* Not found, so it must be a hole */
 			SetPageChecked(page);
@@ -168,6 +169,7 @@
 		}
 		ubifs_err("cannot read page %lu of inode %lu, error %d",
 			  page->index, inode->i_ino, err);
+		ubifs_ro_mode(c, err);
 		goto error;
 	}