svn commit: r316698 - head/sys/fs/nfsclient

[Konstantin Belousov]

Author: kib
Date: Tue Apr 11 08:29:12 2017
New Revision: 316698
URL: https://svnweb.freebsd.org/changeset/base/316698

Log:
  Remove debugging printf.
  
  Instead, issue a diagnostic and return appropriate error if
  ncl_flush() was unable to clean buffer queue after the specified
  number or retries.
  
  Reviewed by:	rmacklem
  Sponsored by:	The FreeBSD Foundation
  MFC after:	2 weeks

Modified:
  head/sys/fs/nfsclient/nfs_clvnops.c

Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c	Tue Apr 11 07:40:43 2017	(r316697)
+++ head/sys/fs/nfsclient/nfs_clvnops.c	Tue Apr 11 08:29:12 2017	(r316698)
@@ -2971,14 +2971,17 @@ done:
 		free(bvec, M_TEMP);
 	if (error == 0 && commit != 0 && waitfor == MNT_WAIT &&
 	    (bo->bo_dirty.bv_cnt != 0 || bo->bo_numoutput != 0 ||
-	     np->n_directio_asyncwr != 0) && trycnt++ < 5) {
-		/* try, try again... */
-		passone = 1;
-		wcred = NULL;
-		bvec = NULL;
-		bvecsize = 0;
-printf("try%d\n", trycnt);
-		goto again;
+	    np->n_directio_asyncwr != 0)) {
+		if (trycnt++ < 5) {
+			/* try, try again... */
+			passone = 1;
+			wcred = NULL;
+			bvec = NULL;
+			bvecsize = 0;
+			goto again;
+		}
+		vn_printf(vp, "ncl_flush failed");
+		error = called_from_renewthread != 0 ? EIO : EBUSY;
 	}
 	return (error);
 }