The branch stable/13 has been updated by kib:

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

commit 2a56a5c2c21a7bf1fc321a60fffbd8d59970633b
Author:     Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-07-22 10:27:43 +0000
Commit:     Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-08-03 09:52:36 +0000

    fifofs: fifo vnode might be relocked before VOP_OPEN() is called
    
    (cherry picked from commit 10db1896495b744aa5b039dd4ef1973b7a339379)
---
 sys/fs/fifofs/fifo_vnops.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index d2a51de84fba..861f1b40a744 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -282,9 +282,21 @@ fifo_close(ap)
        struct pipe *cpipe;
 
        vp = ap->a_vp;
+       ASSERT_VOP_ELOCKED(vp, "fifo_close");
        fip = vp->v_fifoinfo;
+
+       /*
+        * During open, it is possible that the fifo vnode is relocked
+        * after the vnode is instantiated but before VOP_OPEN() is
+        * done.  For instance, vn_open_vnode() might need to upgrade
+        * vnode lock, or ffs_vput_pair() needs to unlock vp to sync
+        * dvp.  In this case, reclaim can observe us with v_fifoinfo
+        * equal to NULL.
+        */
+       if (fip == NULL)
+               return (0);
+
        cpipe = fip->fi_pipe;
-       ASSERT_VOP_ELOCKED(vp, "fifo_close");
        if (ap->a_fflag & FREAD) {
                fip->fi_readers--;
                if (fip->fi_readers == 0) {
_______________________________________________
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"

Reply via email to