From: Ralph Boehme <slow@samba.org>
Date: Thu, 1 Dec 2022 20:38:32 +0000 (+0100)
Subject: smbd: remove oplock paranoia check from file_find_dif()
X-Git-Tag: talloc-2.4.0~364
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ece2cb807a122b7684096f6fe5bcfa277a3844f;p=thirdparty%2Fsamba.git

smbd: remove oplock paranoia check from file_find_dif()

Since 4.16 stat opens will have a real fd, the only case where currently the fd
can still be -1 is a POSIX request on a symlink.

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 f551bc79302..ea1c31f4e85 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -1564,22 +1564,6 @@ files_struct *file_find_dif(struct smbd_server_connection *sconn,
 		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;
 	}