libfuse: remove deprecated fuse_operations.utime_omit_ok

diff --git a/ChangeLog b/ChangeLog
index a8a543436f9407c8df66471a4f59533ed0022af1..502a9bb9011e86c20d77e91e5db38a0311f3e4d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@
        - fuse_lowlevel_is_lib_option()
        - fuse_operations.getdir()
        - fuse_operations.utime()
+       - fuse_operations.utime_omit_ok
 
 2013-02-06  Miklos Szeredi <miklos@szeredi.hu>
 

diff --git a/example/fusexmp_fh.c b/example/fusexmp_fh.c
index 8c5a524011b73dc386e62c7ba645b802687ed389..eea6b9bb5031b65609cca422ba239134851a7516 100644 (file)
--- a/example/fusexmp_fh.c
+++ b/example/fusexmp_fh.c
@@ -553,10 +553,6 @@ static struct fuse_operations xmp_oper = {
 #endif
        .lock           = xmp_lock,
        .flock          = xmp_flock,
-
-#if HAVE_UTIMENSAT
-       .flag_utime_omit_ok = 1,
-#endif
 };
 
 int main(int argc, char *argv[])

diff --git a/include/fuse.h b/include/fuse.h
index 34498ca74ed2015f4d52c80063f2e2a7a00ee306..503776bd93c15c3d6df6ba399d5117a0889751f9 100644 (file)
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -87,16 +87,10 @@ struct fuse_operations {
         */
        unsigned int flag_nopath:1;
 
-       /**
-        * Flag indicating that the filesystem accepts special
-        * UTIME_NOW and UTIME_OMIT values in its utimens operation.
-        */
-       unsigned int flag_utime_omit_ok:1;
-
        /**
         * Reserved flags, don't set
         */
-       unsigned int flag_reserved:30;
+       unsigned int flag_reserved:31;
 
        /** Get file attributes.
         *

diff --git a/lib/fuse.c b/lib/fuse.c
index 72a8bd799bf47f5b1651d124279d07f34148ef98..4d9406dfa0265b906ae6143437fdd21a126a03da 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -142,7 +142,6 @@ struct fuse {
        struct fuse_config conf;
        int intr_installed;
        struct fuse_fs *fs;
-       int utime_omit_ok;
        struct lock_queue_element *lockq;
        int pagesize;
        struct list_head partial_slabs;
@@ -2631,7 +2630,7 @@ static void fuse_lib_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,
                                                       attr->st_size);
                }
 #ifdef HAVE_UTIMENSAT
-               if (!err && f->utime_omit_ok &&
+               if (!err &&
                    (valid & (FUSE_SET_ATTR_ATIME | FUSE_SET_ATTR_MTIME))) {
                        struct timespec tv[2];
 
@@ -4271,7 +4270,6 @@ static int fuse_push_module(struct fuse *f, const char *module,
        newfs->m = m;
        f->fs = newfs;
        f->conf.nopath = newfs->op.flag_nopath && f->conf.nopath;
-       f->utime_omit_ok = newfs->op.flag_utime_omit_ok && f->utime_omit_ok;
        return 0;
 }
 
@@ -4365,7 +4363,6 @@ struct fuse *fuse_new(struct fuse_chan *ch, struct fuse_args *args,
 
        f->fs = fs;
        f->conf.nopath = fs->op.flag_nopath;
-       f->utime_omit_ok = fs->op.flag_utime_omit_ok;
 
        /* Oh f**k, this is ugly! */
        if (!fs->op.lock) {
@@ -4424,7 +4421,6 @@ struct fuse *fuse_new(struct fuse_chan *ch, struct fuse_args *args,
 
        if (f->conf.debug) {
                fprintf(stderr, "nopath: %i\n", f->conf.nopath);
-               fprintf(stderr, "utime_omit_ok: %i\n", f->utime_omit_ok);
        }
 
        /* Trace topmost layer by default */