svn commit: r274787 - stable/10/sys/kern

[Konstantin Belousov]

Author: kib
Date: Fri Nov 21 10:22:54 2014
New Revision: 274787
URL: https://svnweb.freebsd.org/changeset/base/274787

Log:
  MFC r274501:
  In vfs_write_suspend_umnt(), if suspension cannot be established, do
  not forget to restore write ops count when returning the error.

Modified:
  stable/10/sys/kern/vfs_vnops.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/vfs_vnops.c
==============================================================================
--- stable/10/sys/kern/vfs_vnops.c	Fri Nov 21 08:24:37 2014	(r274786)
+++ stable/10/sys/kern/vfs_vnops.c	Fri Nov 21 10:22:54 2014	(r274787)
@@ -1849,8 +1849,10 @@ vfs_write_suspend_umnt(struct mount *mp)
 	for (;;) {
 		vn_finished_write(mp);
 		error = vfs_write_suspend(mp, 0);
-		if (error != 0)
+		if (error != 0) {
+			vn_start_write(NULL, &mp, V_WAIT);
 			return (error);
+		}
 		MNT_ILOCK(mp);
 		if ((mp->mnt_kern_flag & MNTK_SUSPENDED) != 0)
 			break;