From 5e3a7383bde79b460fec5420a093e1e71df389ad Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 8 Sep 2005 14:40:16 +0000 Subject: more reverting --- lib/fuse.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lib/fuse.c') diff --git a/lib/fuse.c b/lib/fuse.c index 2209212..b52febb 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -664,15 +664,12 @@ static int do_chown(struct fuse *f, const char *path, struct stat *attr, return err; } -static int do_truncate(struct fuse *f, const char *path, struct stat *attr, - struct fuse_file_info *fi) +static int do_truncate(struct fuse *f, const char *path, struct stat *attr) { int err; err = -ENOSYS; - if (fi && f->op.ftruncate) - err = f->op.ftruncate(path, attr->st_size, fi); - else if (f->op.truncate) + if (f->op.truncate) err = f->op.truncate(path, attr->st_size); return err; @@ -699,6 +696,8 @@ static void fuse_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr, char *path; int err; + (void) fi; + err = -ENOENT; pthread_rwlock_rdlock(&f->tree_lock); path = get_path(f, ino); @@ -711,7 +710,7 @@ static void fuse_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr, if (!err && (valid & (FUSE_SET_ATTR_UID | FUSE_SET_ATTR_GID))) err = do_chown(f, path, attr, valid); if (!err && (valid & FUSE_SET_ATTR_SIZE)) - err = do_truncate(f, path, attr, fi); + err = do_truncate(f, path, attr); if (!err && (valid & (FUSE_SET_ATTR_ATIME | FUSE_SET_ATTR_MTIME)) == (FUSE_SET_ATTR_ATIME | FUSE_SET_ATTR_MTIME)) err = do_utime(f, path, attr); if (!err) -- cgit v1.2.3