The branch releng/13.0 has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=f889959e0a35ae47205105d3074860272c639c04
commit f889959e0a35ae47205105d3074860272c639c04
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-01-23 22:40:19 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-02-25 20:49:35 +0000
ffs softdep: remove will_direnter argument of softdep_prelink()
Approved by: re (delphij, gjb)
(cherry picked from commit ede40b0675155b5cc862652f2fee11c738a46bcd)
---
sys/ufs/ffs/ffs_extern.h | 2 +-
sys/ufs/ffs/ffs_softdep.c | 46 ++++++++--------------------------------------
sys/ufs/ufs/ufs_vnops.c | 12 ++++++------
3 files changed, 15 insertions(+), 45 deletions(-)
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 9694489266b6..544012089046 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -178,7 +178,7 @@ int softdep_request_cleanup(struct fs *, struct vnode *,
struct ucred *, int);
int softdep_prerename(struct vnode *, struct vnode *, struct vnode *,
struct vnode *);
-int softdep_prelink(struct vnode *, struct vnode *, int);
+int softdep_prelink(struct vnode *, struct vnode *);
void softdep_setup_freeblocks(struct inode *, off_t, int);
void softdep_setup_inomapdep(struct buf *, struct inode *, ino_t, int);
void softdep_setup_blkmapdep(struct buf *, struct mount *, ufs2_daddr_t,
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index e90593b20e40..3cc76f9142c3 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -621,10 +621,9 @@ softdep_prerename(fdvp, fvp, tdvp, tvp)
}
int
-softdep_prelink(dvp, vp, will_direnter)
+softdep_prelink(dvp, vp)
struct vnode *dvp;
struct vnode *vp;
- int will_direnter;
{
panic("softdep_prelink called");
@@ -3358,13 +3357,11 @@ softdep_prerename(fdvp, fvp, tdvp, tvp)
* syscall must be restarted at top level from the lookup.
*/
int
-softdep_prelink(dvp, vp, will_direnter)
+softdep_prelink(dvp, vp)
struct vnode *dvp;
struct vnode *vp;
- int will_direnter;
{
struct ufsmount *ump;
- int error, error1;
ASSERT_VOP_ELOCKED(dvp, "prelink dvp");
if (vp != NULL)
@@ -3372,40 +3369,13 @@ softdep_prelink(dvp, vp, will_direnter)
ump = VFSTOUFS(dvp->v_mount);
/*
- * Nothing to do if we have sufficient journal space.
- * If we currently hold the snapshot lock, we must avoid
- * handling other resources that could cause deadlock.
- *
- * will_direnter == 1: In case allocated a directory block in
- * an indirect block, we must prevent holes in the directory
- * created if directory entries are written out of order. To
- * accomplish this we fsync when we extend a directory into
- * indirects. During rename it's not safe to drop the tvp
- * lock so sync must be delayed until it is.
- *
- * This synchronous step could be removed if fsck and the
- * kernel were taught to fill in sparse directories rather
- * than panic.
+ * Nothing to do if we have sufficient journal space. We skip
+ * flushing when vp is a snapshot to avoid deadlock where
+ * another thread is trying to update the inodeblock for dvp
+ * and is waiting on snaplk that vp holds.
*/
- if (journal_space(ump, 0) || (vp != NULL && IS_SNAPSHOT(VTOI(vp)))) {
- error = 0;
- if (will_direnter && (vp == NULL || !IS_SNAPSHOT(VTOI(vp)))) {
- if (vp != NULL)
- VOP_UNLOCK(vp);
- error = ffs_syncvnode(dvp, MNT_WAIT, 0);
- if (vp != NULL) {
- error1 = vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT);
- if (error1 != 0) {
- vn_lock_pair(dvp, true, vp, false);
- if (error == 0)
- error = ERELOOKUP;
- } else if (vp->v_data == NULL) {
- error = ERELOOKUP;
- }
- }
- }
- return (error);
- }
+ if (journal_space(ump, 0) || (vp != NULL && IS_SNAPSHOT(VTOI(vp))))
+ return (0);
stat_journal_low++;
if (vp != NULL) {
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 22199a390dd4..b035a8b1c34d 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1007,7 +1007,7 @@ ufs_remove(ap)
(VTOI(dvp)->i_flags & APPEND))
return (EPERM);
if (DOINGSOFTDEP(dvp)) {
- error = softdep_prelink(dvp, vp, true);
+ error = softdep_prelink(dvp, vp);
if (error != 0) {
MPASS(error == ERELOOKUP);
return (error);
@@ -1072,7 +1072,7 @@ ufs_link(ap)
#endif
if (DOINGSOFTDEP(tdvp)) {
- error = softdep_prelink(tdvp, vp, true);
+ error = softdep_prelink(tdvp, vp);
if (error != 0) {
MPASS(error == ERELOOKUP);
return (error);
@@ -1144,7 +1144,7 @@ ufs_whiteout(ap)
if (DOINGSOFTDEP(dvp) && (ap->a_flags == CREATE ||
ap->a_flags == DELETE)) {
- error = softdep_prelink(dvp, NULL, true);
+ error = softdep_prelink(dvp, NULL);
if (error != 0) {
MPASS(error == ERELOOKUP);
return (error);
@@ -1946,7 +1946,7 @@ ufs_mkdir(ap)
}
if (DOINGSOFTDEP(dvp)) {
- error = softdep_prelink(dvp, NULL, true);
+ error = softdep_prelink(dvp, NULL);
if (error != 0) {
MPASS(error == ERELOOKUP);
return (error);
@@ -2210,7 +2210,7 @@ ufs_rmdir(ap)
goto out;
}
if (DOINGSOFTDEP(dvp)) {
- error = softdep_prelink(dvp, vp, false);
+ error = softdep_prelink(dvp, vp);
if (error != 0) {
MPASS(error == ERELOOKUP);
return (error);
@@ -2737,7 +2737,7 @@ ufs_makeinode(mode, dvp, vpp, cnp, callfunc)
return (EINVAL);
}
if (DOINGSOFTDEP(dvp)) {
- error = softdep_prelink(dvp, NULL, true);
+ error = softdep_prelink(dvp, NULL);
if (error != 0) {
MPASS(error == ERELOOKUP);
return (error);
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
