Don't confuse lookup count for mountpoint and file

I think this is the reason for a sporadic test failure, where
fuse_lowlevel_notify_store() fails.

diff --git a/example/notify_inval_entry.c b/example/notify_inval_entry.c
index fc8bc1ebcf34a9b1c824500ccb2b10a399e6456e..6b1b5276477f3e3a4875e5e6af90e12a947b0c12 100644 (file)
--- a/example/notify_inval_entry.c
+++ b/example/notify_inval_entry.c
@@ -168,12 +168,13 @@ err_out:
 static void tfs_forget (fuse_req_t req, fuse_ino_t ino,
                         uint64_t nlookup) {
     (void) req;
-    assert(ino == file_ino || ino == FUSE_ROOT_ID);
-    lookup_cnt -= nlookup;
+    if(ino == file_ino)
+        lookup_cnt -= nlookup;
+    else
+        assert(ino == FUSE_ROOT_ID);
     fuse_reply_none(req);
 }
 
-
 static void tfs_getattr(fuse_req_t req, fuse_ino_t ino,
                         struct fuse_file_info *fi) {
     struct stat stbuf;

diff --git a/example/notify_inval_inode.c b/example/notify_inval_inode.c
index 5dfc225c34c0ee27847e98d5fedaf5aec73c2870..4cd5be96c02b71ee8596375a67588b293484ce13 100644 (file)
--- a/example/notify_inval_inode.c
+++ b/example/notify_inval_inode.c
@@ -161,8 +161,10 @@ err_out:
 static void tfs_forget (fuse_req_t req, fuse_ino_t ino,
                         uint64_t nlookup) {
     (void) req;
-    assert(ino == FILE_INO || ino == FUSE_ROOT_ID);
-    lookup_cnt -= nlookup;
+    if(ino == FILE_INO)
+        lookup_cnt -= nlookup;
+    else
+        assert(ino == FUSE_ROOT_ID);
     fuse_reply_none(req);
 }
 

diff --git a/example/notify_store_retrieve.c b/example/notify_store_retrieve.c
index a21d1171e299f7598f84860d04bb57f38b0128b5..dc87619db483273f06e6401d3edf1020c097fed8 100644 (file)
--- a/example/notify_store_retrieve.c
+++ b/example/notify_store_retrieve.c
@@ -164,8 +164,10 @@ err_out:
 static void tfs_forget (fuse_req_t req, fuse_ino_t ino,
                         uint64_t nlookup) {
     (void) req;
-    assert(ino == FILE_INO || ino == FUSE_ROOT_ID);
-    lookup_cnt -= nlookup;
+    if(ino == FILE_INO)
+        lookup_cnt -= nlookup;
+    else
+        assert(ino == FUSE_ROOT_ID);
     fuse_reply_none(req);
 }