X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=read-cache.c;h=34c040ad6c3bd3d2f2f4228ec2aefb9945e0ff84;hb=fbe082a528861af785be15bb37d1c7d8f574daa4;hp=b3eec846731b3c3b8b61f94ba0dff3e80fc1407d;hpb=958ba6c96eb58b359c855c9d07e3e45072f0503e;p=git.git

diff --git a/read-cache.c b/read-cache.c
index b3eec846..34c040ad 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -3,7 +3,6 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include <stdarg.h>
 #include "cache.h"
 
 struct cache_entry **active_cache = NULL;
@@ -18,7 +17,7 @@ void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
 {
 	ce->ce_ctime.sec = htonl(st->st_ctime);
 	ce->ce_mtime.sec = htonl(st->st_mtime);
-#ifdef NSEC
+#ifdef USE_NSEC
 	ce->ce_ctime.nsec = htonl(st->st_ctim.tv_nsec);
 	ce->ce_mtime.nsec = htonl(st->st_mtim.tv_nsec);
 #endif
@@ -51,7 +50,7 @@ int ce_match_stat(struct cache_entry *ce, struct stat *st)
 	if (ce->ce_ctime.sec != htonl(st->st_ctime))
 		changed |= CTIME_CHANGED;
 
-#ifdef NSEC
+#ifdef USE_NSEC
 	/*
 	 * nsec seems unreliable - not all filesystems support it, so
 	 * as long as it is in the inode cache you get right nsec
@@ -66,9 +65,19 @@ int ce_match_stat(struct cache_entry *ce, struct stat *st)
 	if (ce->ce_uid != htonl(st->st_uid) ||
 	    ce->ce_gid != htonl(st->st_gid))
 		changed |= OWNER_CHANGED;
-	if (ce->ce_dev != htonl(st->st_dev) ||
-	    ce->ce_ino != htonl(st->st_ino))
+	if (ce->ce_ino != htonl(st->st_ino))
 		changed |= INODE_CHANGED;
+
+#ifdef USE_STDEV
+	/*
+	 * st_dev breaks on network filesystems where different
+	 * clients will have different views of what "device"
+	 * the filesystem is on
+	 */
+	if (ce->ce_dev != htonl(st->st_dev))
+		changed |= INODE_CHANGED;
+#endif
+
 	if (ce->ce_size != htonl(st->st_size))
 		changed |= DATA_CHANGED;
 	return changed;