diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2005-10-26 16:04:04 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2005-10-26 16:04:04 +0000 |
| commit | 11509ce3fc6a36b6e3c094bf8aa11820f17d0ede (patch) | |
| tree | 7b7584927fab4174852d5c650834326e3f7a8a37 /kernel/dir.c | |
| parent | d9079a75b14b73e7953adf4958709b1e5ab3804c (diff) | |
| download | libfuse-11509ce3fc6a36b6e3c094bf8aa11820f17d0ede.tar.gz | |
add ftruncate() method
Diffstat (limited to 'kernel/dir.c')
| -rw-r--r-- | kernel/dir.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/kernel/dir.c b/kernel/dir.c index bc792cb..48df469 100644 --- a/kernel/dir.c +++ b/kernel/dir.c @@ -838,34 +838,36 @@ static int fuse_dir_fsync(struct file *file, struct dentry *de, int datasync) return file ? fuse_fsync_common(file, de, datasync, 1) : 0; } -static unsigned iattr_to_fattr(struct iattr *iattr, struct fuse_attr *fattr) +static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg) { unsigned ivalid = iattr->ia_valid; - unsigned fvalid = 0; - - memset(fattr, 0, sizeof(*fattr)); if (ivalid & ATTR_MODE) - fvalid |= FATTR_MODE, fattr->mode = iattr->ia_mode; + arg->valid |= FATTR_MODE, arg->mode = iattr->ia_mode; if (ivalid & ATTR_UID) - fvalid |= FATTR_UID, fattr->uid = iattr->ia_uid; + arg->valid |= FATTR_UID, arg->uid = iattr->ia_uid; if (ivalid & ATTR_GID) - fvalid |= FATTR_GID, fattr->gid = iattr->ia_gid; + arg->valid |= FATTR_GID, arg->gid = iattr->ia_gid; if (ivalid & ATTR_SIZE) - fvalid |= FATTR_SIZE, fattr->size = iattr->ia_size; + arg->valid |= FATTR_SIZE, arg->size = iattr->ia_size; /* You can only _set_ these together (they may change by themselves) */ if ((ivalid & (ATTR_ATIME | ATTR_MTIME)) == (ATTR_ATIME | ATTR_MTIME)) { - fvalid |= FATTR_ATIME | FATTR_MTIME; + arg->valid |= FATTR_ATIME | FATTR_MTIME; #ifdef KERNEL_2_6 - fattr->atime = iattr->ia_atime.tv_sec; - fattr->mtime = iattr->ia_mtime.tv_sec; + arg->atime = iattr->ia_atime.tv_sec; + arg->mtime = iattr->ia_mtime.tv_sec; #else - fattr->atime = iattr->ia_atime; - fattr->mtime = iattr->ia_mtime; + arg->atime = iattr->ia_atime; + arg->mtime = iattr->ia_mtime; #endif } - - return fvalid; +#ifdef ATTR_FILE + if (ivalid & ATTR_FILE) { + struct fuse_file *ff = iattr->ia_file->private_data; + arg->valid |= FATTR_FH; + arg->fh = ff->fh; + } +#endif } static int fuse_setattr(struct dentry *entry, struct iattr *attr) @@ -904,7 +906,7 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr) return -EINTR; memset(&inarg, 0, sizeof(inarg)); - inarg.valid = iattr_to_fattr(attr, &inarg.attr); + iattr_to_fattr(attr, &inarg); req->in.h.opcode = FUSE_SETATTR; req->in.h.nodeid = get_node_id(inode); req->inode = inode; |