From: Ralph Boehme <slow@samba.org>
Date: Thu, 19 Nov 2020 10:10:35 +0000 (+0100)
Subject: smbd: reduce indentation in file_find_dif()
X-Git-Tag: samba-4.14.0rc1~364
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05633454f8babf74ee615bd015805ce1e2d96997;p=thirdparty%2Fsamba.git

smbd: reduce indentation in file_find_dif()

No change in behaviour.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 7a7a772f5b5..49538c01cf3 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -746,30 +746,32 @@ files_struct *file_find_dif(struct smbd_server_connection *sconn,
 		 * We can have a fsp->fh->fd == -1 here as it could be a stat
 		 * open.
 		 */
-		if (file_id_equal(&fsp->file_id, &id) &&
-		    fh_get_gen_id(fsp->fh) == gen_id )
+		if (!file_id_equal(&fsp->file_id, &id)) {
+			continue;
+		}
+		if (fh_get_gen_id(fsp->fh) != gen_id) {
+			continue;
+		}
+		if (count > 10) {
+			DLIST_PROMOTE(sconn->files, fsp);
+		}
+		/* Paranoia check. */
+		if ((fsp_get_pathref_fd(fsp) == -1) &&
+		    (fsp->oplock_type != NO_OPLOCK &&
+		     fsp->oplock_type != LEASE_OPLOCK))
 		{
-			if (count > 10) {
-				DLIST_PROMOTE(sconn->files, fsp);
-			}
-			/* Paranoia check. */
-			if ((fsp_get_pathref_fd(fsp) == -1) &&
-			    (fsp->oplock_type != NO_OPLOCK &&
-			     fsp->oplock_type != LEASE_OPLOCK))
-			{
-				struct file_id_buf idbuf;
-
-				DBG_ERR("file %s file_id = "
-					"%s, gen = %u oplock_type = %u is a "
-					"stat open with oplock type !\n",
-					fsp_str_dbg(fsp),
-					file_id_str_buf(fsp->file_id, &idbuf),
-					(unsigned int)fh_get_gen_id(fsp->fh),
-					(unsigned int)fsp->oplock_type);
-				smb_panic("file_find_dif");
-			}
-			return fsp;
+			struct file_id_buf idbuf;
+
+			DBG_ERR("file %s file_id = "
+				"%s, gen = %u oplock_type = %u is a "
+				"stat open with oplock type !\n",
+				fsp_str_dbg(fsp),
+				file_id_str_buf(fsp->file_id, &idbuf),
+				(unsigned int)fh_get_gen_id(fsp->fh),
+				(unsigned int)fsp->oplock_type);
+			smb_panic("file_find_dif");
 		}
+		return fsp;
 	}
 
 	return NULL;