aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse/dir.c
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2007-10-18 06:07:01 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 17:37:30 -0400
commit17637cbaba592076c221dc045ca78422b4af6290 (patch)
tree9b8148b29cb2c776cd96278c0710a890054a2b78 /fs/fuse/dir.c
parentd139d7ffd0c1e81e2a809909b4f8b121a0dc119a (diff)
fuse: improve utimes support
Add two new flags for setattr: FATTR_ATIME_NOW and FATTR_MTIME_NOW. These mean, that atime or mtime should be changed to the current time. Also it is now possible to update atime or mtime individually, not just together. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/fuse/dir.c')
-rw-r--r--fs/fuse/dir.c28
1 files changed, 25 insertions, 3 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 1e941b3f2453..537d38bee13c 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1014,6 +1014,20 @@ static int fuse_dir_fsync(struct file *file, struct dentry *de, int datasync)
1014 return file ? fuse_fsync_common(file, de, datasync, 1) : 0; 1014 return file ? fuse_fsync_common(file, de, datasync, 1) : 0;
1015} 1015}
1016 1016
1017static bool update_mtime(unsigned ivalid)
1018{
1019 /* Always update if mtime is explicitly set */
1020 if (ivalid & ATTR_MTIME_SET)
1021 return true;
1022
1023 /* If it's an open(O_TRUNC) or an ftruncate(), don't update */
1024 if ((ivalid & ATTR_SIZE) && (ivalid & (ATTR_OPEN | ATTR_FILE)))
1025 return false;
1026
1027 /* In all other cases update */
1028 return true;
1029}
1030
1017static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg) 1031static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg)
1018{ 1032{
1019 unsigned ivalid = iattr->ia_valid; 1033 unsigned ivalid = iattr->ia_valid;
@@ -1026,11 +1040,19 @@ static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg)
1026 arg->valid |= FATTR_GID, arg->gid = iattr->ia_gid; 1040 arg->valid |= FATTR_GID, arg->gid = iattr->ia_gid;
1027 if (ivalid & ATTR_SIZE) 1041 if (ivalid & ATTR_SIZE)
1028 arg->valid |= FATTR_SIZE, arg->size = iattr->ia_size; 1042 arg->valid |= FATTR_SIZE, arg->size = iattr->ia_size;
1029 /* You can only _set_ these together (they may change by themselves) */ 1043 if (ivalid & ATTR_ATIME) {
1030 if ((ivalid & (ATTR_ATIME | ATTR_MTIME)) == (ATTR_ATIME | ATTR_MTIME)) { 1044 arg->valid |= FATTR_ATIME;
1031 arg->valid |= FATTR_ATIME | FATTR_MTIME;
1032 arg->atime = iattr->ia_atime.tv_sec; 1045 arg->atime = iattr->ia_atime.tv_sec;
1046 arg->atimensec = iattr->ia_atime.tv_nsec;
1047 if (!(ivalid & ATTR_ATIME_SET))
1048 arg->valid |= FATTR_ATIME_NOW;
1049 }
1050 if ((ivalid & ATTR_MTIME) && update_mtime(ivalid)) {
1051 arg->valid |= FATTR_MTIME;
1033 arg->mtime = iattr->ia_mtime.tv_sec; 1052 arg->mtime = iattr->ia_mtime.tv_sec;
1053 arg->mtimensec = iattr->ia_mtime.tv_nsec;
1054 if (!(ivalid & ATTR_MTIME_SET))
1055 arg->valid |= FATTR_MTIME_NOW;
1034 } 1056 }
1035} 1057}
1036 1058