Fix rollback of mounted filesystem regression

The Illumos openzfs#3875 patch reverted a part of ZoL's 7b3e34b which added special-case error handling for zfs_rezget(). The error handling dealt with the case in which an all-ones object number ended up being passed to dnode_hold() and causing an EINVAL to be returned from zfs_rezget(). Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#1859 Closes openzfs#1861
evanchueng · Nov 14, 2013 · 2008e92 · 2008e92
1 parent 09d672d
commit 2008e92
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
@@ -1480,7 +1480,7 @@ EXPORT_SYMBOL(zfs_suspend_fs);
 int
 zfs_resume_fs(zfs_sb_t *zsb, const char *osname)
 {
-	int err;
+	int err, err2;
 	znode_t *zp;
 	uint64_t sa_obj = 0;
 
@@ -1537,8 +1537,8 @@ zfs_resume_fs(zfs_sb_t *zsb, const char *osname)
 	mutex_enter(&zsb->z_znodes_lock);
 	for (zp = list_head(&zsb->z_all_znodes); zp;
 	    zp = list_next(&zsb->z_all_znodes, zp)) {
-		err = zfs_rezget(zp);
-		if (err) {
+		err2 = zfs_rezget(zp);
+		if (err2) {
 			remove_inode_hash(ZTOI(zp));
 			zp->z_is_stale = B_TRUE;
 		}