commit 4fca432f2d3dd5d07d4ec0f932bc7275fb206f3e
author Miklos Szeredi <miklos@szeredi.hu> Sun Oct 01 14:41:04 2006 +0000
committer Miklos Szeredi <miklos@szeredi.hu> Sun Oct 01 14:41:04 2006 +0000
tree 1616666ff80e11fc5fd628b266fdbb5ad876750a
parent 4003dfa31341e5584375c1423d223f099a6049c7

Add support for FLUSH+RELEASE operation

lib/fuse.c

diff --git a/lib/fuse.c b/lib/fuse.c
index c28528e..c87bff3 100644
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -583,6 +583,17 @@
     return res;
 }
 
+static int fuse_do_flush(struct fuse *f, fuse_req_t req, const char *path,
+                         struct fuse_file_info *fi)
+{
+    int res;
+    struct fuse_intr_data d;
+    fuse_prepare_interrupt(f, req, &d);
+    res = f->op.flush(path, fi);
+    fuse_finish_interrupt(f, req, &d);
+    return res;
+}
+
 static int fuse_do_statfs(struct fuse *f, fuse_req_t req, const char *path,
                           struct statvfs *buf)
 {
@@ -1628,14 +1639,17 @@
     char *path;
     struct node *node;
     int unlink_hidden = 0;
+    int err = 0;
 
     pthread_rwlock_rdlock(&f->tree_lock);
     path = get_path(f, ino);
     if (f->conf.debug) {
-        printf("RELEASE[%llu] flags: 0x%x\n", (unsigned long long) fi->fh,
-               fi->flags);
+        printf("RELEASE%s[%llu] flags: 0x%x\n", fi->flush ? "+FLUSH" : "", 
+               (unsigned long long) fi->fh, fi->flags);
         fflush(stdout);
     }
+    if (fi->flush && path && f->op.flush)
+        err = fuse_do_flush(f, req, path, fi);
     if (f->op.release)
         fuse_compat_release(f, req, path, fi);
 
@@ -1656,7 +1670,7 @@
         free(path);
     pthread_rwlock_unlock(&f->tree_lock);
 
-    reply_err(req, 0);
+    reply_err(req, err);
 }
 
 static void fuse_fsync(fuse_req_t req, fuse_ino_t ino, int datasync,
@@ -2277,12 +2291,8 @@
             fflush(stdout);
         }
         err = -ENOSYS;
-        if (f->op.flush) {
-            struct fuse_intr_data d;
-            fuse_prepare_interrupt(f, req, &d);
-            err = f->op.flush(path, fi);
-            fuse_finish_interrupt(f, req, &d);
-        }
+        if (f->op.flush)
+            err = fuse_do_flush(f, req, path, fi);
         free(path);
     }
     if (f->op.lock) {