aboutsummaryrefslogtreecommitdiff
path: root/sys/kern/vfs_syscalls.c
diff options
context:
space:
mode:
authorPaul Saab <ps@FreeBSD.org>2009-06-08 21:23:54 +0000
committerPaul Saab <ps@FreeBSD.org>2009-06-08 21:23:54 +0000
commit27bfb741a01a2eafe4cf87d015852552c77290fa (patch)
tree0aab3ab07073d31e07902129e05eb637c62a659d /sys/kern/vfs_syscalls.c
parenta91ac60c20863b121cf2f1deda5d2a7997a73157 (diff)
Simply shared vnode locking and extend it to also include fsync.
Also, in vop_write, no longer assert for exclusive locks on the vnode. Reviewed by: jhb, kmacy, jeffr
Notes
Notes: svn path=/head/; revision=193762
Diffstat (limited to 'sys/kern/vfs_syscalls.c')
-rw-r--r--sys/kern/vfs_syscalls.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 72a53f8f7058..1cc6d2d31264 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -3476,7 +3476,7 @@ fsync(td, uap)
struct mount *mp;
struct file *fp;
int vfslocked;
- int error;
+ int error, lock_flags;
AUDIT_ARG(fd, uap->fd);
if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0)
@@ -3485,7 +3485,13 @@ fsync(td, uap)
vfslocked = VFS_LOCK_GIANT(vp->v_mount);
if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
goto drop;
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ if (MNT_SHARED_WRITES(mp) ||
+ ((mp == NULL) && MNT_SHARED_WRITES(vp->v_mount))) {
+ lock_flags = LK_SHARED;
+ } else {
+ lock_flags = LK_EXCLUSIVE;
+ }
+ vn_lock(vp, lock_flags | LK_RETRY);
AUDIT_ARG(vnode, vp, ARG_VNODE1);
if (vp->v_object != NULL) {
VM_OBJECT_LOCK(vp->v_object);