Page MenuHomeFreeBSD
Files F156848686

D34126.id102202.diff
No OneTemporary
Actions

D34126.id102202.diff
View Options

diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -181,7 +181,7 @@
ldep->de_diroffset = diroffset;
ldep->de_inode = inode;
cluster_init_vn(&ldep->de_clusterw);
- lockmgr(nvp->v_vnlock, LK_EXCLUSIVE, NULL);
+ lockmgr(nvp->v_vnlock, LK_EXCLUSIVE | LK_NOWITNESS, NULL);
VN_LOCK_AREC(nvp); /* for doscheckpath */
fc_purge(ldep, 0); /* init the FAT cache for this denode */
error = insmntque(nvp, mntp);
@@ -206,9 +206,9 @@
/*
* Copy the directory entry into the denode area of the vnode.
*/
- if ((dirclust == MSDOSFSROOT
- || (FAT32(pmp) && dirclust == pmp->pm_rootdirblk))
- && diroffset == MSDOSFSROOT_OFS) {
+ if ((dirclust == MSDOSFSROOT ||
+ (FAT32(pmp) && dirclust == pmp->pm_rootdirblk)) &&
+ diroffset == MSDOSFSROOT_OFS) {
/*
* Directory entry for the root directory. There isn't one,
* so we manufacture one. We should probably rummage
@@ -387,7 +387,7 @@
if (dep->de_FileSize < length) {
vnode_pager_setsize(DETOV(dep), length);
- return deextend(dep, length, cred);
+ return (deextend(dep, length, cred));
}
/*
@@ -477,7 +477,7 @@
return (error);
}
fc_setcache(dep, FC_LASTFC, de_cluster(pmp, length - 1),
- eofentry);
+ eofentry);
}
/*
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1891,7 +1891,7 @@
/*
* FFS supports recursive locking.
*/
- lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL);
+ lockmgr(vp->v_vnlock, LK_EXCLUSIVE | LK_NOWITNESS, NULL);
VN_LOCK_AREC(vp);
vp->v_data = ip;
vp->v_bufobj.bo_bsize = fs->fs_bsize;

File Metadata

Mime Type
text/plain
Expires
Sun, May 17, 9:35 PM (4 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33210943
Default Alt Text
D34126.id102202.diff (1 KB)

Event Timeline