[Midnightbsd-cvs] src [8236] trunk/sys/kern/vfs_syscalls.c: aquire the rangelock for truncate(2)

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 17 17:28:11 EDT 2016


Revision: 8236
          http://svnweb.midnightbsd.org/src/?rev=8236
Author:   laffer1
Date:     2016-09-17 17:28:11 -0400 (Sat, 17 Sep 2016)
Log Message:
-----------
aquire the rangelock for truncate(2)

Modified Paths:
--------------
    trunk/sys/kern/vfs_syscalls.c

Modified: trunk/sys/kern/vfs_syscalls.c
===================================================================
--- trunk/sys/kern/vfs_syscalls.c	2016-09-17 21:27:46 UTC (rev 8235)
+++ trunk/sys/kern/vfs_syscalls.c	2016-09-17 21:28:11 UTC (rev 8236)
@@ -3462,10 +3462,10 @@
 {
 	struct mount *mp;
 	struct vnode *vp;
+	void *rl_cookie;
 	struct vattr vattr;
-	int error;
 	struct nameidata nd;
-	int vfslocked;
+	int error, vfslocked;
 
 	if (length < 0)
 		return(EINVAL);
@@ -3474,7 +3474,9 @@
 		return (error);
 	vfslocked = NDHASGIANT(&nd);
 	vp = nd.ni_vp;
+	rl_cookie = vn_rangelock_wlock(vp, 0, OFF_MAX);
 	if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) {
+		vn_rangelock_unlock(vp, rl_cookie);
 		vrele(vp);
 		VFS_UNLOCK_GIANT(vfslocked);
 		return (error);
@@ -3493,8 +3495,10 @@
 		vattr.va_size = length;
 		error = VOP_SETATTR(vp, &vattr, td->td_ucred);
 	}
-	vput(vp);
+	VOP_UNLOCK(vp, 0);
 	vn_finished_write(mp);
+	vn_rangelock_unlock(vp, rl_cookie);
+	vrele(vp);
 	VFS_UNLOCK_GIANT(vfslocked);
 	return (error);
 }



More information about the Midnightbsd-cvs mailing list