Use UUIDs to identify filesystems if kernel supports it.

[nfs-utils.git] / support / nfs / cacheio.c

diff --git a/support/nfs/cacheio.c b/support/nfs/cacheio.c
index ff5b02813e256c12b017da5356d80ecb17b9c43c..4df80a6f3efcf97e7be438e09b95a6f28669c045 100644 (file)
--- a/support/nfs/cacheio.c
+++ b/support/nfs/cacheio.c
@@ -109,10 +109,10 @@ void qword_printint(FILE *f, int num)
        fprintf(f, "%d ", num);
 }
 
-void qword_eol(FILE *f)
+int qword_eol(FILE *f)
 {
        fprintf(f,"\n");
-       fflush(f);
+       return fflush(f);
 }
 
 
@@ -205,16 +205,17 @@ int readline(int fd, char **buf, int *lenp)
         */
                char *new;
                int nl;
-               *lenp += 128;
+               *lenp *= 2;
                new = realloc(*buf, *lenp);
                if (new == NULL)
                        return 0;
-               nl = read(fd, *buf +len, *lenp - len);
-               if (nl <= 0 )
+               *buf = new;
+               nl = read(fd, *buf + len, *lenp - len);
+               if (nl <= 0)
                        return 0;
-               new += nl;
+               len += nl;
        }
-       (*buf)[len-1] = 0;
+       (*buf)[len-1] = '\0';
        return 1;
 }
 
@@ -227,7 +228,8 @@ int
 check_new_cache(void)
 {
        struct stat stb;
-       return (stat("/proc/fs/nfs/filehandle", &stb) == 0);
+       return  (stat("/proc/fs/nfs/filehandle", &stb) == 0) ||
+               (stat("/proc/fs/nfsd/filehandle", &stb) == 0);
 }      
 
 
@@ -245,15 +247,24 @@ cache_flush(int force)
        int c;
        char stime[20];
        char path[200];
+       time_t now;
+       /* Note: the order of these caches is important.
+        * They need to be flushed in dependancy order. So
+        * a cache that references items in another cache,
+        * as nfsd.fh entries reference items in nfsd.export,
+        * must be flushed before the cache that it references.
+        */
        static char *cachelist[] = {
                "auth.unix.ip",
-               "nfsd.export",
                "nfsd.fh",
+               "nfsd.export",
                NULL
        };
-       stb.st_mtime = time(0);
-       if (!force)
-               stat(_PATH_ETAB, &stb);
+       now = time(0);
+       if (force ||
+           stat(_PATH_ETAB, &stb) != 0 ||
+           stb.st_mtime > now)
+               stb.st_mtime = time(0);
        
        sprintf(stime, "%ld\n", stb.st_mtime);
        for (c=0; cachelist[c]; c++) {