Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F101955325
D44046.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
728 B
Referenced Files
None
Subscribers
None
D44046.diff
View Options
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -4101,9 +4101,11 @@
{
int error, locked1;
- MPASS(((lkflags1 & LK_SHARED) != 0) ^ ((lkflags1 & LK_EXCLUSIVE) != 0));
+ MPASS((((lkflags1 & LK_SHARED) != 0) ^ ((lkflags1 & LK_EXCLUSIVE) != 0)) ||
+ (vp1 == NULL && lkflags1 == 0));
MPASS((lkflags1 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0);
- MPASS(((lkflags2 & LK_SHARED) != 0) ^ ((lkflags2 & LK_EXCLUSIVE) != 0));
+ MPASS((((lkflags2 & LK_SHARED) != 0) ^ ((lkflags2 & LK_EXCLUSIVE) != 0)) ||
+ (vp2 == NULL && lkflags2 == 0));
MPASS((lkflags2 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0);
if (vp1 == NULL && vp2 == NULL)
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Nov 6, 6:50 PM (18 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14498378
Default Alt Text
D44046.diff (728 B)
Attached To
Mode
D44046: vn_lock_pair(): only assert on lkflags1/lkflags2 vp1/vp2 is non-NULL
Attached
Detach File
Event Timeline
Log In to Comment