git: e681d7d702d6 - stable/13 - msdosfs: fix double unlock if the source file disappears

Edward Tomasz Napierala trasz at FreeBSD.org
Tue Mar 2 18:43:40 UTC 2021


The branch stable/13 has been updated by trasz:

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

commit e681d7d702d65f7a44e3bb42e86e7a1784edf847
Author:     Edward Tomasz Napierala <trasz at FreeBSD.org>
AuthorDate: 2021-01-31 21:07:02 +0000
Commit:     Edward Tomasz Napierala <trasz at FreeBSD.org>
CommitDate: 2021-03-02 18:43:26 +0000

    msdosfs: fix double unlock if the source file disappears
    
    We would unlock fvp here, only to unlock it again below,
    just before "bad".
    
    Reviewed By:    kib
    Tested by:      pho
    Sponsored by:   NetApp, Inc.
    Sponsored by:   Klara, Inc.
    Differential Revision: https://reviews.freebsd.org/D27339
    
    (cherry picked from commit cb696212495995c8374d9fe12fbae340614af45c)
---
 sys/fs/msdosfs/msdosfs_vnops.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index b940633e0cfd..e1e679d92146 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1139,7 +1139,6 @@ abortit:
 	if (xp != ip) {
 		if (doingdirectory)
 			panic("rename: lost dir entry");
-		VOP_UNLOCK(fvp);
 		if (newparent)
 			VOP_UNLOCK(fdvp);
 		vrele(ap->a_fvp);


More information about the dev-commits-src-all mailing list