git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c5cbe48
)
s3: Slightly simplify delay_for_batch_oplocks
author
Volker Lendecke
<vl@samba.org>
Thu, 15 Dec 2011 13:33:06 +0000
(14:33 +0100)
committer
Volker Lendecke
<vl@samba.org>
Fri, 16 Dec 2011 06:34:47 +0000
(07:34 +0100)
source3/smbd/open.c
patch
|
blob
|
history
diff --git
a/source3/smbd/open.c
b/source3/smbd/open.c
index 9174388a8b4e270bf13ba7704e61d633e4714882..fefed85d0c4639fa36236911b64244990bbca989 100644
(file)
--- a/
source3/smbd/open.c
+++ b/
source3/smbd/open.c
@@
-1158,13
+1158,13
@@
static bool delay_for_batch_oplocks(files_struct *fsp,
if ((oplock_request & INTERNAL_OPEN_ONLY) || is_stat_open(fsp->access_mask)) {
return false;
}
if ((oplock_request & INTERNAL_OPEN_ONLY) || is_stat_open(fsp->access_mask)) {
return false;
}
-
- if (batch_entry != NULL) {
- /* Found a batch oplock */
- send_break_message(fsp, batch_entry, mid, oplock_request);
- return true;
+ if (batch_entry == NULL) {
+ return false;
}
}
- return false;
+
+ /* Found a batch oplock */
+ send_break_message(fsp, batch_entry, mid, oplock_request);
+ return true;
}
static bool delay_for_exclusive_oplocks(files_struct *fsp,
}
static bool delay_for_exclusive_oplocks(files_struct *fsp,