From 394d67a891553ad51fd85c5de35ee740601ddc5d Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Date: Tue, 12 Mar 1991 02:23:34 -0800
Subject: [PATCH] reset directory link counts on I/O failure

SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 7.56
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.56
SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 7.56
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.56
---
 usr/src/sys/ufs/ffs/ffs_vnops.c | 34 ++++++++++++++++++---------------
 usr/src/sys/ufs/ffs/ufs_vnops.c | 34 ++++++++++++++++++---------------
 usr/src/sys/ufs/lfs/lfs_vnops.c | 34 ++++++++++++++++++---------------
 usr/src/sys/ufs/ufs/ufs_vnops.c | 34 ++++++++++++++++++---------------
 4 files changed, 76 insertions(+), 60 deletions(-)

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index 0fee3e699a..0e24cc0450 100644
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)ffs_vnops.c	7.55 (Berkeley) %G%
+ *	@(#)ffs_vnops.c	7.56 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -859,6 +859,7 @@ ufs_link(vp, ndp)
 		error = direnter(ip, ndp);
 	if (ndp->ni_dvp != vp)
 		IUNLOCK(ip);
+	vput(ndp->ni_dvp);
 	if (error) {
 		ip->i_nlink--;
 		ip->i_flag |= ICHG;
@@ -1001,8 +1002,14 @@ ufs_rename(fndp, tndp)
 			if (error = iupdat(dp, &time, &time, 1))
 				goto bad;
 		}
-		if (error = direnter(ip, tndp))
-			goto out;
+		if (error = direnter(ip, tndp)) {
+			if (doingdirectory && newparent) {
+				dp->i_nlink--;
+				dp->i_flag |= ICHG;
+				(void) iupdat(dp, &time, &time, 1);
+			}
+			goto bad;
+		}
 	} else {
 		if (xp->i_dev != dp->i_dev || xp->i_dev != ip->i_dev)
 			panic("rename: EXDEV");
@@ -1233,7 +1240,8 @@ ufs_mkdir(ndp, vap)
 	 */
 	dp->i_nlink++;
 	dp->i_flag |= ICHG;
-	error = iupdat(dp, &time, &time, 1);
+	if (error = iupdat(dp, &time, &time, 1))
+		goto bad;
 
 	/*
 	 * Initialize directory with "."
@@ -1261,13 +1269,12 @@ ufs_mkdir(ndp, vap)
 	 * install the entry for it in
 	 * the parent directory.
 	 */
-	error = direnter(ip, ndp);
-	dp = NULL;
-	if (error) {
+	if (error = direnter(ip, ndp)) {
 		ndp->ni_nameiop &= ~(MODMASK | OPMASK);
-		ndp->ni_nameiop |= LOOKUP | NOCACHE;
+		ndp->ni_nameiop |= LOOKUP | LOCKLEAF | NOCACHE;
 		error = namei(ndp);
 		if (!error) {
+			iput(dp);
 			dp = VTOI(ndp->ni_vp);
 			dp->i_nlink--;
 			dp->i_flag |= ICHG;
@@ -1285,8 +1292,7 @@ bad:
 		iput(ip);
 	} else
 		ndp->ni_vp = ITOV(ip);
-	if (dp)
-		iput(dp);
+	iput(dp);
 	return (error);
 }
 
@@ -1717,10 +1723,9 @@ maknode(mode, ndp, ipp)
 	 */
 	if (error = iupdat(ip, &time, &time, 1))
 		goto bad;
-	if (error = direnter(ip, ndp)) {
-		pdir = NULL;
+	if (error = direnter(ip, ndp))
 		goto bad;
-	}
+	iput(pdir);
 	*ipp = ip;
 	return (0);
 
@@ -1729,8 +1734,7 @@ bad:
 	 * Write error occurred trying to update the inode
 	 * or the directory so must deallocate the inode.
 	 */
-	if (pdir)
-		iput(pdir);
+	iput(pdir);
 	ip->i_nlink = 0;
 	ip->i_flag |= ICHG;
 	iput(ip);
diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 25e4356f4a..8716f219d6 100644
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)ufs_vnops.c	7.55 (Berkeley) %G%
+ *	@(#)ufs_vnops.c	7.56 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -859,6 +859,7 @@ ufs_link(vp, ndp)
 		error = direnter(ip, ndp);
 	if (ndp->ni_dvp != vp)
 		IUNLOCK(ip);
+	vput(ndp->ni_dvp);
 	if (error) {
 		ip->i_nlink--;
 		ip->i_flag |= ICHG;
@@ -1001,8 +1002,14 @@ ufs_rename(fndp, tndp)
 			if (error = iupdat(dp, &time, &time, 1))
 				goto bad;
 		}
-		if (error = direnter(ip, tndp))
-			goto out;
+		if (error = direnter(ip, tndp)) {
+			if (doingdirectory && newparent) {
+				dp->i_nlink--;
+				dp->i_flag |= ICHG;
+				(void) iupdat(dp, &time, &time, 1);
+			}
+			goto bad;
+		}
 	} else {
 		if (xp->i_dev != dp->i_dev || xp->i_dev != ip->i_dev)
 			panic("rename: EXDEV");
@@ -1233,7 +1240,8 @@ ufs_mkdir(ndp, vap)
 	 */
 	dp->i_nlink++;
 	dp->i_flag |= ICHG;
-	error = iupdat(dp, &time, &time, 1);
+	if (error = iupdat(dp, &time, &time, 1))
+		goto bad;
 
 	/*
 	 * Initialize directory with "."
@@ -1261,13 +1269,12 @@ ufs_mkdir(ndp, vap)
 	 * install the entry for it in
 	 * the parent directory.
 	 */
-	error = direnter(ip, ndp);
-	dp = NULL;
-	if (error) {
+	if (error = direnter(ip, ndp)) {
 		ndp->ni_nameiop &= ~(MODMASK | OPMASK);
-		ndp->ni_nameiop |= LOOKUP | NOCACHE;
+		ndp->ni_nameiop |= LOOKUP | LOCKLEAF | NOCACHE;
 		error = namei(ndp);
 		if (!error) {
+			iput(dp);
 			dp = VTOI(ndp->ni_vp);
 			dp->i_nlink--;
 			dp->i_flag |= ICHG;
@@ -1285,8 +1292,7 @@ bad:
 		iput(ip);
 	} else
 		ndp->ni_vp = ITOV(ip);
-	if (dp)
-		iput(dp);
+	iput(dp);
 	return (error);
 }
 
@@ -1717,10 +1723,9 @@ maknode(mode, ndp, ipp)
 	 */
 	if (error = iupdat(ip, &time, &time, 1))
 		goto bad;
-	if (error = direnter(ip, ndp)) {
-		pdir = NULL;
+	if (error = direnter(ip, ndp))
 		goto bad;
-	}
+	iput(pdir);
 	*ipp = ip;
 	return (0);
 
@@ -1729,8 +1734,7 @@ bad:
 	 * Write error occurred trying to update the inode
 	 * or the directory so must deallocate the inode.
 	 */
-	if (pdir)
-		iput(pdir);
+	iput(pdir);
 	ip->i_nlink = 0;
 	ip->i_flag |= ICHG;
 	iput(ip);
diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index 15f391d170..352579ec7c 100644
--- a/usr/src/sys/ufs/lfs/lfs_vnops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)lfs_vnops.c	7.55 (Berkeley) %G%
+ *	@(#)lfs_vnops.c	7.56 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -859,6 +859,7 @@ ufs_link(vp, ndp)
 		error = direnter(ip, ndp);
 	if (ndp->ni_dvp != vp)
 		IUNLOCK(ip);
+	vput(ndp->ni_dvp);
 	if (error) {
 		ip->i_nlink--;
 		ip->i_flag |= ICHG;
@@ -1001,8 +1002,14 @@ ufs_rename(fndp, tndp)
 			if (error = iupdat(dp, &time, &time, 1))
 				goto bad;
 		}
-		if (error = direnter(ip, tndp))
-			goto out;
+		if (error = direnter(ip, tndp)) {
+			if (doingdirectory && newparent) {
+				dp->i_nlink--;
+				dp->i_flag |= ICHG;
+				(void) iupdat(dp, &time, &time, 1);
+			}
+			goto bad;
+		}
 	} else {
 		if (xp->i_dev != dp->i_dev || xp->i_dev != ip->i_dev)
 			panic("rename: EXDEV");
@@ -1233,7 +1240,8 @@ ufs_mkdir(ndp, vap)
 	 */
 	dp->i_nlink++;
 	dp->i_flag |= ICHG;
-	error = iupdat(dp, &time, &time, 1);
+	if (error = iupdat(dp, &time, &time, 1))
+		goto bad;
 
 	/*
 	 * Initialize directory with "."
@@ -1261,13 +1269,12 @@ ufs_mkdir(ndp, vap)
 	 * install the entry for it in
 	 * the parent directory.
 	 */
-	error = direnter(ip, ndp);
-	dp = NULL;
-	if (error) {
+	if (error = direnter(ip, ndp)) {
 		ndp->ni_nameiop &= ~(MODMASK | OPMASK);
-		ndp->ni_nameiop |= LOOKUP | NOCACHE;
+		ndp->ni_nameiop |= LOOKUP | LOCKLEAF | NOCACHE;
 		error = namei(ndp);
 		if (!error) {
+			iput(dp);
 			dp = VTOI(ndp->ni_vp);
 			dp->i_nlink--;
 			dp->i_flag |= ICHG;
@@ -1285,8 +1292,7 @@ bad:
 		iput(ip);
 	} else
 		ndp->ni_vp = ITOV(ip);
-	if (dp)
-		iput(dp);
+	iput(dp);
 	return (error);
 }
 
@@ -1717,10 +1723,9 @@ maknode(mode, ndp, ipp)
 	 */
 	if (error = iupdat(ip, &time, &time, 1))
 		goto bad;
-	if (error = direnter(ip, ndp)) {
-		pdir = NULL;
+	if (error = direnter(ip, ndp))
 		goto bad;
-	}
+	iput(pdir);
 	*ipp = ip;
 	return (0);
 
@@ -1729,8 +1734,7 @@ bad:
 	 * Write error occurred trying to update the inode
 	 * or the directory so must deallocate the inode.
 	 */
-	if (pdir)
-		iput(pdir);
+	iput(pdir);
 	ip->i_nlink = 0;
 	ip->i_flag |= ICHG;
 	iput(ip);
diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index 25e4356f4a..8716f219d6 100644
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)ufs_vnops.c	7.55 (Berkeley) %G%
+ *	@(#)ufs_vnops.c	7.56 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -859,6 +859,7 @@ ufs_link(vp, ndp)
 		error = direnter(ip, ndp);
 	if (ndp->ni_dvp != vp)
 		IUNLOCK(ip);
+	vput(ndp->ni_dvp);
 	if (error) {
 		ip->i_nlink--;
 		ip->i_flag |= ICHG;
@@ -1001,8 +1002,14 @@ ufs_rename(fndp, tndp)
 			if (error = iupdat(dp, &time, &time, 1))
 				goto bad;
 		}
-		if (error = direnter(ip, tndp))
-			goto out;
+		if (error = direnter(ip, tndp)) {
+			if (doingdirectory && newparent) {
+				dp->i_nlink--;
+				dp->i_flag |= ICHG;
+				(void) iupdat(dp, &time, &time, 1);
+			}
+			goto bad;
+		}
 	} else {
 		if (xp->i_dev != dp->i_dev || xp->i_dev != ip->i_dev)
 			panic("rename: EXDEV");
@@ -1233,7 +1240,8 @@ ufs_mkdir(ndp, vap)
 	 */
 	dp->i_nlink++;
 	dp->i_flag |= ICHG;
-	error = iupdat(dp, &time, &time, 1);
+	if (error = iupdat(dp, &time, &time, 1))
+		goto bad;
 
 	/*
 	 * Initialize directory with "."
@@ -1261,13 +1269,12 @@ ufs_mkdir(ndp, vap)
 	 * install the entry for it in
 	 * the parent directory.
 	 */
-	error = direnter(ip, ndp);
-	dp = NULL;
-	if (error) {
+	if (error = direnter(ip, ndp)) {
 		ndp->ni_nameiop &= ~(MODMASK | OPMASK);
-		ndp->ni_nameiop |= LOOKUP | NOCACHE;
+		ndp->ni_nameiop |= LOOKUP | LOCKLEAF | NOCACHE;
 		error = namei(ndp);
 		if (!error) {
+			iput(dp);
 			dp = VTOI(ndp->ni_vp);
 			dp->i_nlink--;
 			dp->i_flag |= ICHG;
@@ -1285,8 +1292,7 @@ bad:
 		iput(ip);
 	} else
 		ndp->ni_vp = ITOV(ip);
-	if (dp)
-		iput(dp);
+	iput(dp);
 	return (error);
 }
 
@@ -1717,10 +1723,9 @@ maknode(mode, ndp, ipp)
 	 */
 	if (error = iupdat(ip, &time, &time, 1))
 		goto bad;
-	if (error = direnter(ip, ndp)) {
-		pdir = NULL;
+	if (error = direnter(ip, ndp))
 		goto bad;
-	}
+	iput(pdir);
 	*ipp = ip;
 	return (0);
 
@@ -1729,8 +1734,7 @@ bad:
 	 * Write error occurred trying to update the inode
 	 * or the directory so must deallocate the inode.
 	 */
-	if (pdir)
-		iput(pdir);
+	iput(pdir);
 	ip->i_nlink = 0;
 	ip->i_flag |= ICHG;
 	iput(ip);
-- 
2.20.1