summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-09-21 23:39:19 +0000
committerJeremy Allison <jra@samba.org>2000-09-21 23:39:19 +0000
commitd31a72f7390339ec2bb0f3af5da014d635ce09dd (patch)
treecf27e8804b289197c983d4951083274f8287278d
parentb774aa4b8978b7824e6a0361672179afb1fc7b2d (diff)
downloadsamba-d31a72f7390339ec2bb0f3af5da014d635ce09dd.tar.gz
samba-d31a72f7390339ec2bb0f3af5da014d635ce09dd.tar.bz2
samba-d31a72f7390339ec2bb0f3af5da014d635ce09dd.zip
Optimization (noticed by bloody Andrew :-) to stop directory scan ever
being done if any of the directory timestamps were changed. Jeremy. (This used to be commit 915152ed981e8e537d15fd4b80b3c3d10ee86bff)
-rw-r--r--source3/smbd/notify_hash.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/source3/smbd/notify_hash.c b/source3/smbd/notify_hash.c
index 95d430d23b..a8cdcea17d 100644
--- a/source3/smbd/notify_hash.c
+++ b/source3/smbd/notify_hash.c
@@ -39,7 +39,7 @@ struct change_data {
Create the hash we will use to determine if the contents changed.
*****************************************************************************/
static BOOL notify_hash(connection_struct *conn, char *path, uint32 flags,
- struct change_data *data)
+ struct change_data *data, struct change_data *old_data)
{
SMB_STRUCT_STAT st;
pstring full_name;
@@ -52,10 +52,21 @@ static BOOL notify_hash(connection_struct *conn, char *path, uint32 flags,
ZERO_STRUCTP(data);
if(dos_stat(path, &st) == -1) return False;
-
+
data->modify_time = st.st_mtime;
data->status_time = st.st_ctime;
+ if (old_data) {
+ /*
+ * Shortcut to avoid directory scan if the time
+ * has changed - we always must return true then.
+ */
+ if (old_data->modify_time != data->modify_time ||
+ old_data->status_time != data->status_time ) {
+ return True;
+ }
+ }
+
/*
* If we are to watch for changes that are only stored
* in inodes of files, not in the directory inode, we must
@@ -108,7 +119,7 @@ static void *hash_register_notify(connection_struct *conn, char *path, uint32 fl
{
struct change_data data;
- if (!notify_hash(conn, path, flags, &data)) return NULL;
+ if (!notify_hash(conn, path, flags, &data, NULL)) return NULL;
data.last_check_time = time(NULL);
@@ -132,7 +143,7 @@ static BOOL hash_check_notify(connection_struct *conn, uint16 vuid, char *path,
return True;
}
- if (!notify_hash(conn, path, flags, &data2) ||
+ if (!notify_hash(conn, path, flags, &data2, data) ||
data2.modify_time != data->modify_time ||
data2.status_time != data->status_time ||
data2.total_time != data->total_time ||