diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | example/fusexmp_fh.c | 4 | ||||
-rw-r--r-- | include/fuse.h | 8 | ||||
-rw-r--r-- | lib/fuse.c | 6 |
4 files changed, 3 insertions, 16 deletions
@@ -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 8c5a524..eea6b9b 100644 --- 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 34498ca..503776b 100644 --- a/include/fuse.h +++ b/include/fuse.h @@ -88,15 +88,9 @@ 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. * @@ -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 */ |