diff options
| author | Volker Lendecke <vl@samba.org> | 2011-12-15 14:33:06 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2011-12-16 07:34:47 +0100 |
| commit | b3d8ecaf52851493afa7ff07d8cfd10cd32d99e6 (patch) | |
| tree | 864435cb4589d3c3a7bbaabf888821adf50237a9 | |
| parent | c5cbe481a759316be5d598123233cc859078d74a (diff) | |
| download | samba-b3d8ecaf52851493afa7ff07d8cfd10cd32d99e6.tar.gz samba-b3d8ecaf52851493afa7ff07d8cfd10cd32d99e6.tar.bz2 samba-b3d8ecaf52851493afa7ff07d8cfd10cd32d99e6.zip | |
s3: Slightly simplify delay_for_batch_oplocks
| -rw-r--r-- | source3/smbd/open.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 9174388a8b..fefed85d0c 100644 --- 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 (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, |