6891437 DEADCODE in zfs_ioc_recv after dmu_recv_end.
authorGeorge Wilson <George.Wilson@Sun.COM>
Tue, 23 Feb 2010 13:03:31 -0800
changeset 11812 453b88fd62f1
parent 11811 b25d9f1b5d8e
child 11813 0803c01d7cdd
6891437 DEADCODE in zfs_ioc_recv after dmu_recv_end.
usr/src/uts/common/fs/zfs/zfs_ioctl.c
--- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c	Tue Feb 23 12:12:25 2010 -0800
+++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c	Tue Feb 23 13:03:31 2010 -0800
@@ -3520,11 +3520,8 @@
 			 * likely also fail, and clean up after itself.
 			 */
 			end_err = dmu_recv_end(&drc);
-			if (error == 0) {
-				int resume_err =
-				    zfs_resume_fs(zfsvfs, tofs);
-				error = error ? error : resume_err;
-			}
+			if (error == 0)
+				error = zfs_resume_fs(zfsvfs, tofs);
 			error = error ? error : end_err;
 			VFS_RELE(zfsvfs->z_vfs);
 		} else {