summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-12-22 14:01:25 -0800
committerJames Peach <jpeach@samba.org>2007-12-22 14:01:25 -0800
commit1176e04c76e28d9ee9ab355c5e9edcd1b627ac03 (patch)
treeb0f7c53699b543a49232990996e3af795dece9fc
parentdf133758c2496a5c99441635eca6b77c9019cb8c (diff)
downloadsamba-1176e04c76e28d9ee9ab355c5e9edcd1b627ac03.tar.gz
samba-1176e04c76e28d9ee9ab355c5e9edcd1b627ac03.tar.bz2
samba-1176e04c76e28d9ee9ab355c5e9edcd1b627ac03.zip
Cache the underlying filesystem capabilities at connection time.
This change alters the Samba connection code to cache the filesystem capabilities when a new client connects. This can be used to enable filesystem specific optimisations is a general manner. (This used to be commit de3c5b808a941ac8e9ebe7169536d8290067eef5)
-rw-r--r--source3/include/smb.h4
-rw-r--r--source3/smbd/service.c15
2 files changed, 19 insertions, 0 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 1222c9a73a..63ae51ecd4 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -658,10 +658,14 @@ typedef struct connection_struct {
int num_files_open;
unsigned int num_smb_operations; /* Count of smb operations on this tree. */
+ /* Semantics requested by the client or forced by the server config. */
bool case_sensitive;
bool case_preserve;
bool short_case_preserve;
+ /* Semantics provided by the underlying filesystem. */
+ int fs_capabilities;
+
name_compare_entry *hide_list; /* Per-share list of files to return as hidden. */
name_compare_entry *veto_list; /* Per-share list of files to veto (never show). */
name_compare_entry *veto_oplock_list; /* Per-share list of files to refuse oplocks on. */
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index ed43528c76..8e69a3b381 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -1165,6 +1165,21 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
}
#endif
+ /* Figure out the characteristics of the underlying filesystem. This
+ * assumes that all the filesystem mounted withing a share path have
+ * the same characteristics, which is likely but not guaranteed.
+ */
+ {
+ vfs_statvfs_struct svfs;
+
+ conn->fs_capabilities =
+ FILE_CASE_SENSITIVE_SEARCH | FILE_CASE_PRESERVED_NAMES;
+
+ if (SMB_VFS_STATVFS(conn, conn->connectpath, &svfs) == 0) {
+ conn->fs_capabilities = svfs.FsCapabilities;
+ }
+ }
+
/*
* Print out the 'connected as' stuff here as we need
* to know the effective uid and gid we will be using