cifs: Recognize SFU char/block devices created by Windows NFS server on Windows Serve...

Windows NFS server versions on Windows Server older than 2012 release use
for storing char and block devices modified SFU format, not compatible with
the original SFU. Windows NFS server on Windows Server 2012 and new
versions use different format (reparse points), not related to SFU-style.

SFU / SUA / Interix subsystem stores the major and major numbers as pair of
64-bit integer, but Windows NFS server stores as pair of 32-bit integers.

Which makes char and block devices between Windows NFS server <<2012 and
Windows SFU/SUA/Interix subsytem incompatible.

So improve Linux SMB client.

When SFU mode is enabled (mount option -o sfu is specified) then recognize
also these kind of char and block devices and its major and minor numbers,
which are used by Windows Server versions older than 2012.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/inode.c b/fs/smb/client/inode.c
index 72ebd72..de8063b 100644 (file)
--- a/fs/smb/client/inode.c
+++ b/fs/smb/client/inode.c
@@ -598,6 +598,17 @@ cifs_sfu_type(struct cifs_fattr *fattr, const char *path,
                                mjr = le64_to_cpu(*(__le64 *)(pbuf+8));
                                mnr = le64_to_cpu(*(__le64 *)(pbuf+16));
                                fattr->cf_rdev = MKDEV(mjr, mnr);
+                       } else if (bytes_read == 16) {
+                               /*
+                                * Windows NFS server before Windows Server 2012
+                                * stores major and minor number in SFU-modified
+                                * style, just as 32-bit numbers. Recognize it.
+                                */
+                               __u32 mjr; /* major */
+                               __u32 mnr; /* minor */
+                               mjr = le32_to_cpu(*(__le32 *)(pbuf+8));
+                               mnr = le32_to_cpu(*(__le32 *)(pbuf+12));
+                               fattr->cf_rdev = MKDEV(mjr, mnr);
                        }
                } else if (memcmp("IntxCHR\0", pbuf, 8) == 0) {
                        cifs_dbg(FYI, "Char device\n");
@@ -610,6 +621,17 @@ cifs_sfu_type(struct cifs_fattr *fattr, const char *path,
                                mjr = le64_to_cpu(*(__le64 *)(pbuf+8));
                                mnr = le64_to_cpu(*(__le64 *)(pbuf+16));
                                fattr->cf_rdev = MKDEV(mjr, mnr);
+                       } else if (bytes_read == 16) {
+                               /*
+                                * Windows NFS server before Windows Server 2012
+                                * stores major and minor number in SFU-modified
+                                * style, just as 32-bit numbers. Recognize it.
+                                */
+                               __u32 mjr; /* major */
+                               __u32 mnr; /* minor */
+                               mjr = le32_to_cpu(*(__le32 *)(pbuf+8));
+                               mnr = le32_to_cpu(*(__le32 *)(pbuf+12));
+                               fattr->cf_rdev = MKDEV(mjr, mnr);
                        }
                } else if (memcmp("LnxSOCK", pbuf, 8) == 0) {
                        cifs_dbg(FYI, "Socket\n");