From 985dbedf2764b63048d4ae7a2fd319b1e3560229 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 30 May 2012 11:28:19 +0200 Subject: 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 --- source3/smbd/open.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/smbd') 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; -- cgit