smbd: cache DOS attributes in struct smb_filename.cached_dos_attributes

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14215

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index a043cbc883e6312bba30e933f53ace33fc9d3fc5..862bf49861b9825a694ab59337ddf79f7b635799 100644 (file)
--- a/libcli/smb/smb_constants.h
+++ b/libcli/smb/smb_constants.h
@@ -329,6 +329,7 @@ enum csc_policy {
 #define FLAGS2_UNICODE_STRINGS         0x8000
 
 /* FileAttributes (search attributes) field */
+#define FILE_ATTRIBUTES_INVALID        0x0000L
 #define FILE_ATTRIBUTE_READONLY                0x0001L
 #define FILE_ATTRIBUTE_HIDDEN          0x0002L
 #define FILE_ATTRIBUTE_SYSTEM          0x0004L

diff --git a/source3/include/includes.h b/source3/include/includes.h
index bb93aad02a00791fd705322b4923d8ab1ba060e1..27ce2074a7229c6b2b886f197f2bd82742d38085 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -201,6 +201,7 @@ struct stat_ex {
        struct timespec st_ex_mtime;
        struct timespec st_ex_ctime;
        struct timespec st_ex_btime; /* birthtime */
+       uint32_t        cached_dos_attributes;
 
        blksize_t       st_ex_blksize;
        blkcnt_t        st_ex_blocks;

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 33623969ef375229f19bef9d90d47d02baa0b2b5..fc7afccfdb39248dcb3740797414a02b2798234e 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -376,6 +376,7 @@
  * Version 47 - Change SMB_VFS_OPENAT() to match the Linux openat2 prototype, add vfs_open_how
  * Version 47 - Add VFS_OPEN_HOW_RESOLVE_NO_SYMLINKS for SMB_VFS_OPENAT()
  * Change to Version 48 - will ship with 4.18
+ * Version 48 - Add cached_dos_attributes to struct stat_ex
  */
 
 #define SMB_VFS_INTERFACE_VERSION 48

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index a16d6ec7c90b51fd3c5a01036cf7b7b6162d4c13..40fe7b5166aad5cbdedbea0421a495730e2f2a6e 100644 (file)
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -727,6 +727,10 @@ uint32_t fdos_mode(struct files_struct *fsp)
                return FILE_ATTRIBUTE_NORMAL;
        }
 
+       if (fsp->fsp_name->st.cached_dos_attributes != FILE_ATTRIBUTES_INVALID) {
+               return fsp->fsp_name->st.cached_dos_attributes;
+       }
+
        /* Get the DOS attributes via the VFS if we can */
        status = vfs_fget_dos_attributes(fsp, &result);
        if (!NT_STATUS_IS_OK(status)) {
@@ -738,8 +742,8 @@ uint32_t fdos_mode(struct files_struct *fsp)
                }
        }
 
-       result = dos_mode_post(result, fsp, __func__);
-       return result;
+       fsp->fsp_name->st.cached_dos_attributes = dos_mode_post(result, fsp, __func__);
+       return fsp->fsp_name->st.cached_dos_attributes;
 }
 
 struct dos_mode_at_state {
@@ -940,6 +944,7 @@ int file_set_dosmode(connection_struct *conn,
        }
 
        if (NT_STATUS_IS_OK(status)) {
+               smb_fname->st.cached_dos_attributes = dosmode;
                ret = 0;
                goto done;
        }
@@ -1147,6 +1152,7 @@ NTSTATUS file_set_sparse(connection_struct *conn,
                     FILE_NOTIFY_CHANGE_ATTRIBUTES,
                     fsp->fsp_name->base_name);
 
+       fsp->fsp_name->st.cached_dos_attributes = new_dosmode;
        fsp->fsp_flags.is_sparse = sparse;
 
        return NT_STATUS_OK;

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index b494a8b789ae4e082dfbd4b63063772fc89d57c6..095a01723b1a53549c0b1fce78c5afdf439b9ce5 100644 (file)
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -1843,6 +1843,7 @@ files_struct *file_fsp(struct smb_request *req, uint16_t fid)
        }
 
        req->chain_fsp = fsp;
+       fsp->fsp_name->st.cached_dos_attributes = FILE_ATTRIBUTES_INVALID;
        return fsp;
 }
 
@@ -1889,6 +1890,8 @@ struct files_struct *file_fsp_get(struct smbd_smb2_request *smb2req,
                return NULL;
        }
 
+       fsp->fsp_name->st.cached_dos_attributes = FILE_ATTRIBUTES_INVALID;
+
        return fsp;
 }
 
@@ -1902,6 +1905,8 @@ struct files_struct *file_fsp_smb2(struct smbd_smb2_request *smb2req,
                if (smb2req->compat_chain_fsp->fsp_flags.closing) {
                        return NULL;
                }
+               smb2req->compat_chain_fsp->fsp_name->st.cached_dos_attributes =
+                       FILE_ATTRIBUTES_INVALID;
                return smb2req->compat_chain_fsp;
        }
 
@@ -2027,6 +2032,7 @@ static NTSTATUS fsp_attach_smb_fname(struct files_struct *fsp,
 
        fsp->name_hash = name_hash;
        fsp->fsp_name = smb_fname_new;
+       fsp->fsp_name->st.cached_dos_attributes = FILE_ATTRIBUTES_INVALID;
        *_smb_fname = NULL;
        return NT_STATUS_OK;
 }