Page MenuHomeFreeBSD
Files F115547322

D35577.diff
No OneTemporary
Actions

D35577.diff
View Options

diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -196,6 +196,21 @@
VI_UNLOCK(vp);
}
+static int
+ufs_sync_nlink1(struct mount *mp)
+{
+ int error;
+
+ error = vfs_busy(mp, 0);
+ if (error == 0) {
+ VFS_SYNC(mp, MNT_WAIT);
+ vfs_unbusy(mp);
+ error = ERELOOKUP;
+ }
+ vfs_rel(mp);
+ return (error);
+}
+
static int
ufs_sync_nlink(struct vnode *vp, struct vnode *vp1)
{
@@ -214,13 +229,7 @@
VOP_UNLOCK(vp);
if (vp1 != NULL)
VOP_UNLOCK(vp1);
- error = vfs_busy(mp, 0);
- if (error == 0) {
- VFS_SYNC(mp, MNT_WAIT);
- vfs_unbusy(mp);
- error = ERELOOKUP;
- }
- vfs_rel(mp);
+ error = ufs_sync_nlink1(mp);
vn_lock_pair(vp, false, vp1, false);
return (error);
}
@@ -1441,8 +1450,34 @@
newparent = 0;
ino = fip->i_number;
if (fip->i_nlink >= UFS_LINK_MAX) {
- error = EMLINK;
- goto unlockout;
+ if (!DOINGSOFTDEP(fvp) || fip->i_effnlink >= UFS_LINK_MAX) {
+ error = EMLINK;
+ goto unlockout;
+ }
+ vfs_ref(mp);
+ MPASS(!want_seqc_end);
+ if (checkpath_locked) {
+ sx_xunlock(&VFSTOUFS(mp)->um_checkpath_lock);
+ checkpath_locked = false;
+ }
+ VOP_UNLOCK(fdvp);
+ VOP_UNLOCK(fvp);
+ vref(tdvp);
+ if (tvp != NULL)
+ vref(tvp);
+ VOP_VPUT_PAIR(tdvp, &tvp, true);
+ error = ufs_sync_nlink1(mp);
+ if (error == ERELOOKUP) {
+ error = 0;
+ atomic_add_int(&rename_restarts, 1);
+ goto relock;
+ }
+ vrele(fdvp);
+ vrele(fvp);
+ vrele(tdvp);
+ if (tvp != NULL)
+ vrele(tvp);
+ return (error);
}
if ((fip->i_flags & (NOUNLINK | IMMUTABLE | APPEND))
|| (fdp->i_flags & APPEND)) {
@@ -1556,8 +1591,46 @@
* .. is rewritten below.
*/
if (tdp->i_nlink >= UFS_LINK_MAX) {
- error = EMLINK;
- goto bad;
+ if (!DOINGSOFTDEP(tdvp) ||
+ tdp->i_effnlink >= UFS_LINK_MAX) {
+ error = EMLINK;
+ goto unlockout;
+ }
+ fip->i_effnlink--;
+ fip->i_nlink--;
+ DIP_SET(fip, i_nlink, fip->i_nlink);
+ UFS_INODE_SET_FLAG(fip, IN_CHANGE);
+ if (DOINGSOFTDEP(fvp))
+ softdep_revert_link(tdp, fip);
+ MPASS(want_seqc_end);
+ if (tvp != NULL)
+ vn_seqc_write_end(tvp);
+ vn_seqc_write_end(tdvp);
+ vn_seqc_write_end(fvp);
+ vn_seqc_write_end(fdvp);
+ want_seqc_end = false;
+ vfs_ref(mp);
+ MPASS(checkpath_locked);
+ sx_xunlock(&VFSTOUFS(mp)->um_checkpath_lock);
+ checkpath_locked = false;
+ VOP_UNLOCK(fdvp);
+ VOP_UNLOCK(fvp);
+ vref(tdvp);
+ if (tvp != NULL)
+ vref(tvp);
+ VOP_VPUT_PAIR(tdvp, &tvp, true);
+ error = ufs_sync_nlink1(mp);
+ if (error == ERELOOKUP) {
+ error = 0;
+ atomic_add_int(&rename_restarts, 1);
+ goto relock;
+ }
+ vrele(fdvp);
+ vrele(fvp);
+ vrele(tdvp);
+ if (tvp != NULL)
+ vrele(tvp);
+ return (error);
}
}
ufs_makedirentry(fip, tcnp, &newdir);

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 26, 4:12 AM (15 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17797788
Default Alt Text
D35577.diff (2 KB)

Event Timeline