git: ffa424772e9f - stable/13 - Call softdep_prealloc() before taking ffs_lock_ea(), if unlock is committing

[Konstantin Belousov]

The branch stable/13 has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=ffa424772e9f679c59610e4a6173cfab8d0b4943

commit ffa424772e9f679c59610e4a6173cfab8d0b4943
Author:     Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-02-21 10:11:54 +0000
Commit:     Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-02-25 12:55:18 +0000

    Call softdep_prealloc() before taking ffs_lock_ea(), if unlock is committing
    
    (cherry picked from commit 6f30ac9995ff662a2fee5eda4cd87dd0f0e337ba)
---
 sys/ufs/ffs/ffs_vnops.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 64c72f3d3cc4..af03b369a280 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -1552,6 +1552,12 @@ struct vop_closeextattr_args {
        if (ap->a_commit && (vp->v_mount->mnt_flag & MNT_RDONLY) != 0)
                return (EROFS);
 
+       if (ap->a_commit && DOINGSUJ(vp)) {
+               ASSERT_VOP_ELOCKED(vp, "ffs_closeextattr commit");
+               softdep_prealloc(vp, MNT_WAIT);
+               if (vp->v_data == NULL)
+                       return (EBADF);
+       }
        return (ffs_close_ea(vp, ap->a_commit, ap->a_cred, ap->a_td));
 }
 
@@ -1600,6 +1606,13 @@ vop_deleteextattr {
                return (error);
        }
 
+       if (DOINGSUJ(vp)) {
+               ASSERT_VOP_ELOCKED(vp, "ffs_deleteextattr");
+               softdep_prealloc(vp, MNT_WAIT);
+               if (vp->v_data == NULL)
+                       return (EBADF);
+       }
+
        error = ffs_open_ea(vp, ap->a_cred, ap->a_td);
        if (error)
                return (error);
@@ -1801,6 +1814,13 @@ vop_setextattr {
                return (error);
        }
 
+       if (DOINGSUJ(vp)) {
+               ASSERT_VOP_ELOCKED(vp, "ffs_deleteextattr");
+               softdep_prealloc(vp, MNT_WAIT);
+               if (vp->v_data == NULL)
+                       return (EBADF);
+       }
+
        error = ffs_open_ea(vp, ap->a_cred, ap->a_td);
        if (error)
                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"