]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbstatus: delete wrong EXCLUSIVE+BATCH oplock
authorJule Anger <janger@samba.org>
Mon, 9 May 2022 10:09:18 +0000 (12:09 +0200)
committerJule Anger <janger@samba.org>
Mon, 8 Aug 2022 12:56:28 +0000 (12:56 +0000)
It is not possible to have an EXCLUSIVE+BATCH oplock, because a BATCH
oplock includes an EXCLUSIVE oplock. Therefore, an EXCLUSIVE+BATCH-Oplock
and a BATCH-Oplock are the same thing.

Signed-off-by: Jule Anger <janger@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/utils/status.c

index e860436d72bdff703982a2537e24aed1621f6916..37d3b0975640f547c9c8abb8959a23bf618b71b8 100644 (file)
@@ -179,13 +179,10 @@ static int print_share_mode(struct file_id fid,
                        d_printf("RDONLY     ");
                }
 
-               if((e->op_type & (EXCLUSIVE_OPLOCK|BATCH_OPLOCK)) == 
-                                       (EXCLUSIVE_OPLOCK|BATCH_OPLOCK)) {
-                       d_printf("EXCLUSIVE+BATCH ");
+               if (e->op_type & BATCH_OPLOCK) {
+                       d_printf("BATCH           ");
                } else if (e->op_type & EXCLUSIVE_OPLOCK) {
                        d_printf("EXCLUSIVE       ");
-               } else if (e->op_type & BATCH_OPLOCK) {
-                       d_printf("BATCH           ");
                } else if (e->op_type & LEVEL_II_OPLOCK) {
                        d_printf("LEVEL_II        ");
                } else if (e->op_type == LEASE_OPLOCK) {