From: David Howells <dhowells@redhat.com>
Date: Mon, 20 Oct 2025 09:16:07 +0000 (+0100)
Subject: cifs: #include cifsglob.h before trace.h to allow structs in tracepoints
X-Git-Tag: v6.18-rc3~19^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64c9471aa9ded2440bf182b1c71d3f93f80b2f85;p=thirdparty%2Flinux.git

cifs: #include cifsglob.h before trace.h to allow structs in tracepoints

Make cifs #include cifsglob.h in advance of #including trace.h so that the
structures defined in cifsglob.h can be accessed directly by the cifs
tracepoints rather than the callers having to manually pass in the bits and
pieces.

This should allow the tracepoints to be made more efficient to use as well
as easier to read in the code.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Paulo Alcantara <pc@manguebit.org>
cc: linux-cifs@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
Signed-off-by: Steve French <stfrench@microsoft.com>
---

diff --git a/fs/smb/client/cifsproto.h b/fs/smb/client/cifsproto.h
index 4976be2c47c14..fb1813cbe0ebc 100644
--- a/fs/smb/client/cifsproto.h
+++ b/fs/smb/client/cifsproto.h
@@ -9,6 +9,7 @@
 #define _CIFSPROTO_H
 #include <linux/nls.h>
 #include <linux/ctype.h>
+#include "cifsglob.h"
 #include "trace.h"
 #ifdef CONFIG_CIFS_DFS_UPCALL
 #include "dfs_cache.h"
diff --git a/fs/smb/client/trace.c b/fs/smb/client/trace.c
index 4654837871934..16b0e719731fd 100644
--- a/fs/smb/client/trace.c
+++ b/fs/smb/client/trace.c
@@ -4,5 +4,6 @@
  *
  *   Author(s): Steve French <stfrench@microsoft.com>
  */
+#include "cifsglob.h"
 #define CREATE_TRACE_POINTS
 #include "trace.h"