summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-05-30 11:28:19 +0200
committerJeremy Allison <jra@samba.org>2012-06-15 21:07:55 -0700
commit985dbedf2764b63048d4ae7a2fd319b1e3560229 (patch)
treec687f23e7cf2fb043d9eeccc5aa889f86b5e2a7f
parentd1d36d2563685a71874e5d584662dfd8de9418a5 (diff)
downloadsamba-985dbedf2764b63048d4ae7a2fd319b1e3560229.tar.gz
samba-985dbedf2764b63048d4ae7a2fd319b1e3560229.tar.bz2
samba-985dbedf2764b63048d4ae7a2fd319b1e3560229.zip
s3: Slightly simplify grant_fsp_oplock_type
The "else" is not necessary, we did a return in the if-branch Signed-off-by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/smbd/open.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 8fa28be096..26d6971a42 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1283,7 +1283,9 @@ static void grant_fsp_oplock_type(files_struct *fsp,
DEBUG(10,("grant_fsp_oplock_type: oplock type 0x%x on file %s\n",
fsp->oplock_type, fsp_str_dbg(fsp)));
return;
- } else if (lp_locking(fsp->conn->params) && file_has_brlocks(fsp)) {
+ }
+
+ if (lp_locking(fsp->conn->params) && file_has_brlocks(fsp)) {
DEBUG(10,("grant_fsp_oplock_type: file %s has byte range locks\n",
fsp_str_dbg(fsp)));
fsp->oplock_type = NO_OPLOCK;