From: Maxim P. <MPa...@pa...> - 2014-04-15 11:29:02
|
Handling truncate(2), VFS doesn't set ATTR_MTIME bit in iattr structure; only ATTR_SIZE bit is set. In-kernel fuse must handle the case by setting mtime fields of struct fuse_setattr_in to "now" and set FATTR_MTIME bit even though ATTR_MTIME was not set. Signed-off-by: Maxim Patlasov <MPa...@pa...> --- fs/fuse/dir.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 5b4e035..c7cb41c 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1503,10 +1503,11 @@ static bool update_mtime(unsigned ivalid, bool trust_local_mtime) return true; } -static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg, - bool trust_local_mtime) +static void iattr_to_fattr(struct inode *inode, struct iattr *iattr, + struct fuse_setattr_in *arg, bool trust_local_mtime) { unsigned ivalid = iattr->ia_valid; + struct timespec now = current_fs_time(inode->i_sb); if (ivalid & ATTR_MODE) arg->valid |= FATTR_MODE, arg->mode = iattr->ia_mode; @@ -1529,6 +1530,10 @@ static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg, arg->mtimensec = iattr->ia_mtime.tv_nsec; if (!(ivalid & ATTR_MTIME_SET) && !trust_local_mtime) arg->valid |= FATTR_MTIME_NOW; + } else if ((ivalid & ATTR_SIZE) && trust_local_mtime) { + arg->valid |= FATTR_MTIME; + arg->mtime = now.tv_sec; + arg->mtimensec = now.tv_nsec; } } @@ -1682,7 +1687,7 @@ int fuse_do_setattr(struct inode *inode, struct iattr *attr, memset(&inarg, 0, sizeof(inarg)); memset(&outarg, 0, sizeof(outarg)); - iattr_to_fattr(attr, &inarg, trust_local_mtime); + iattr_to_fattr(inode, attr, &inarg, trust_local_mtime); if (file) { struct fuse_file *ff = file->private_data; inarg.valid |= FATTR_FH; @@ -1711,8 +1716,9 @@ int fuse_do_setattr(struct inode *inode, struct iattr *attr, spin_lock(&fc->lock); /* the kernel maintains i_mtime locally */ - if (trust_local_mtime && (attr->ia_valid & ATTR_MTIME)) { - inode->i_mtime = attr->ia_mtime; + if (trust_local_mtime && (attr->ia_valid & (ATTR_MTIME | ATTR_SIZE))) { + inode->i_mtime.tv_sec = inarg.mtime; + inode->i_mtime.tv_nsec = inarg.mtimensec; clear_bit(FUSE_I_MTIME_DIRTY, &fi->state); } |