Initial patch provided by Miklos Szeredi <mszeredi@redhat.com>

diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h
index 09da620b56aefaa88df3a29a8e60c65fb2d95399..e0666a1f7563cda7afad237bdff47e1088148039 100644 (file)
--- a/include/fuse_kernel.h
+++ b/include/fuse_kernel.h
@@ -387,6 +387,12 @@ struct fuse_file_lock {
  */
 #define FUSE_FSYNC_FDATASYNC   (1 << 0)
 
+/**
+ * notify_inval_entry flags
+ * FUSE_EXPIRE_ONLY
+ */
+#define FUSE_EXPIRE_ONLY               (1 << 0)
+
 enum fuse_opcode {
        FUSE_LOOKUP             = 1,
        FUSE_FORGET             = 2,  /* no reply */
@@ -800,7 +806,7 @@ struct fuse_notify_inval_inode_out {
 struct fuse_notify_inval_entry_out {
        uint64_t        parent;
        uint32_t        namelen;
-       uint32_t        padding;
+       uint32_t        flags;
 };
 
 struct fuse_notify_delete_out {

diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index b76be71b86e7d6630bc4ed54023de48b4f334b75..cceb9be6a1e597e440c7666d75795505770fc279 100644 (file)
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -1675,6 +1675,14 @@ int fuse_lowlevel_notify_inval_inode(struct fuse_session *se, fuse_ino_t ino,
 int fuse_lowlevel_notify_inval_entry(struct fuse_session *se, fuse_ino_t parent,
                                     const char *name, size_t namelen);
 
+enum fuse_expire_flags {
+       FUSE_LL_EXPIRE_ONLY     = (1 << 0),
+};
+
+int fuse_lowlevel_notify_expire_entry(struct fuse_session *se, fuse_ino_t parent,
+                                      const char *name, size_t namelen,
+                                      enum fuse_expire_flags flags);
+
 /**
  * This function behaves like fuse_lowlevel_notify_inval_entry() with
  * the following additional effect (at least as of Linux kernel 4.8):

diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index e82cd9e9ffb8a8f855ed61ecce95418fdfc40c9f..7b9d71043505f2e301fa66bb039e162565f1f9d7 100644 (file)
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -2268,21 +2268,24 @@ int fuse_lowlevel_notify_inval_inode(struct fuse_session *se, fuse_ino_t ino,
        return send_notify_iov(se, FUSE_NOTIFY_INVAL_INODE, iov, 2);
 }
 
-int fuse_lowlevel_notify_inval_entry(struct fuse_session *se, fuse_ino_t parent,
-                                    const char *name, size_t namelen)
+int fuse_lowlevel_notify_expire_entry(struct fuse_session *se, fuse_ino_t parent,
+                                     const char *name, size_t namelen,
+                                     enum fuse_expire_flags flags)
 {
        struct fuse_notify_inval_entry_out outarg;
        struct iovec iov[3];
 
        if (!se)
                return -EINVAL;
-       
+
        if (se->conn.proto_minor < 12)
                return -ENOSYS;
 
        outarg.parent = parent;
        outarg.namelen = namelen;
-       outarg.padding = 0;
+       outarg.flags = 0;
+       if (flags & FUSE_LL_EXPIRE_ONLY)
+               outarg.flags |= FUSE_EXPIRE_ONLY;
 
        iov[1].iov_base = &outarg;
        iov[1].iov_len = sizeof(outarg);
@@ -2292,6 +2295,13 @@ int fuse_lowlevel_notify_inval_entry(struct fuse_session *se, fuse_ino_t parent,
        return send_notify_iov(se, FUSE_NOTIFY_INVAL_ENTRY, iov, 3);
 }
 
+int fuse_lowlevel_notify_inval_entry(struct fuse_session *se, fuse_ino_t parent,
+                                    const char *name, size_t namelen)
+{
+       return fuse_lowlevel_notify_expire_entry(se, parent, name, namelen, 0);
+}
+
+
 int fuse_lowlevel_notify_delete(struct fuse_session *se,
                                fuse_ino_t parent, fuse_ino_t child,
                                const char *name, size_t namelen)

diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index a1e9ed8df4737339ed63be63ad61a562f4d5ae96..114f59269a6d60a08375d6fc205829fedbec8d41 100644 (file)
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -185,6 +185,7 @@ FUSE_3.12 {
                fuse_parse_cmdline;
                fuse_parse_cmdline_30;
                fuse_parse_cmdline_312;
+               fuse_lowlevel_notify_expire_entry;
 } FUSE_3.4;
 
 # Local Variables: