From c1abf13059571edd59d42d676ffe593fb987c019 Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@microsoft.com>
Date: Tue, 14 Sep 2021 00:22:02 -0500
Subject: [PATCH 2/2] cifs: rename uapi/linux/cifs directory to
 uapi/linux/smbfs_client

To be more consistent with the new source directory name for the
client ("fs/smbfs_client" instead of "fs/cifs"), and to avoid
using the word "cifs" (a very old dialect) when more recent
dialects (like SMB3 or SMB3.1.1) are meant, rename the cifs
include directory in uapi from cifs to smbfs_client

Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
---
 fs/smbfs_client/cifs_swn.c                               | 2 +-
 fs/smbfs_client/cifsglob.h                               | 2 +-
 fs/smbfs_client/netlink.c                                | 2 +-
 include/uapi/linux/{cifs => smbfs_client}/cifs_mount.h   | 0
 include/uapi/linux/{cifs => smbfs_client}/cifs_netlink.h | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename include/uapi/linux/{cifs => smbfs_client}/cifs_mount.h (100%)
 rename include/uapi/linux/{cifs => smbfs_client}/cifs_netlink.h (100%)

diff --git a/fs/smbfs_client/cifs_swn.c b/fs/smbfs_client/cifs_swn.c
index 12bde7bfda86..0ad801a6a2e9 100644
--- a/fs/smbfs_client/cifs_swn.c
+++ b/fs/smbfs_client/cifs_swn.c
@@ -7,7 +7,7 @@
 
 #include <linux/kref.h>
 #include <net/genetlink.h>
-#include <uapi/linux/cifs/cifs_netlink.h>
+#include <uapi/linux/smbfs_client/cifs_netlink.h>
 
 #include "cifs_swn.h"
 #include "cifsglob.h"
diff --git a/fs/smbfs_client/cifsglob.h b/fs/smbfs_client/cifsglob.h
index 7dd9878e26bf..1c7e5cdabb5a 100644
--- a/fs/smbfs_client/cifsglob.h
+++ b/fs/smbfs_client/cifsglob.h
@@ -19,7 +19,7 @@
 #include "cifsacl.h"
 #include <crypto/internal/hash.h>
 #include <linux/scatterlist.h>
-#include <uapi/linux/cifs/cifs_mount.h>
+#include <uapi/linux/smbfs_client/cifs_mount.h>
 #include "smb2pdu.h"
 
 #define CIFS_MAGIC_NUMBER 0xFF534D42      /* the first four bytes of SMB PDUs */
diff --git a/fs/smbfs_client/netlink.c b/fs/smbfs_client/netlink.c
index 291cb606f149..42ff5ed309d8 100644
--- a/fs/smbfs_client/netlink.c
+++ b/fs/smbfs_client/netlink.c
@@ -6,7 +6,7 @@
  */
 
 #include <net/genetlink.h>
-#include <uapi/linux/cifs/cifs_netlink.h>
+#include <uapi/linux/smbfs_client/cifs_netlink.h>
 
 #include "netlink.h"
 #include "cifsglob.h"
diff --git a/include/uapi/linux/cifs/cifs_mount.h b/include/uapi/linux/smbfs_client/cifs_mount.h
similarity index 100%
rename from include/uapi/linux/cifs/cifs_mount.h
rename to include/uapi/linux/smbfs_client/cifs_mount.h
diff --git a/include/uapi/linux/cifs/cifs_netlink.h b/include/uapi/linux/smbfs_client/cifs_netlink.h
similarity index 100%
rename from include/uapi/linux/cifs/cifs_netlink.h
rename to include/uapi/linux/smbfs_client/cifs_netlink.h
-- 
2.30.2