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: Steve French <sfrench@samba.org>
cc: Paulo Alcantara <pc@manguebit.org>
cc: linux-cifs@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
---
 fs/smb/client/cifsproto.h |    1 +
 fs/smb/client/trace.c     |    1 +
 2 files changed, 2 insertions(+)

diff --git a/fs/smb/client/cifsproto.h b/fs/smb/client/cifsproto.h
index 07dc4d766192..4ef6459de564 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 465483787193..16b0e719731f 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"

Do you have patches in process that will depend on this?

On Mon, Oct 20, 2025 at 4:16 AM David Howells <dhowells@redhat.com> wrote:
>
>
> 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: Steve French <sfrench@samba.org>
> cc: Paulo Alcantara <pc@manguebit.org>
> cc: linux-cifs@vger.kernel.org
> cc: linux-fsdevel@vger.kernel.org
> ---
>  fs/smb/client/cifsproto.h |    1 +
>  fs/smb/client/trace.c     |    1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/fs/smb/client/cifsproto.h b/fs/smb/client/cifsproto.h
> index 07dc4d766192..4ef6459de564 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 465483787193..16b0e719731f 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"
>
>


-- 
Thanks,

Steve