Commit 17637cbaba592076c221dc045ca78422b4af6290
Committed by
Linus Torvalds
Linus Torvalds
1 parent
d139d7ffd0
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>
Showing 2 changed files with 27 additions and 3 deletions Side-by-side Diff
fs/fuse/dir.c
| ... | ... | @@ -1014,6 +1014,20 @@ |
| 1014 | 1014 | return file ? fuse_fsync_common(file, de, datasync, 1) : 0; |
| 1015 | 1015 | } |
| 1016 | 1016 | |
| 1017 | +static 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 | + | |
| 1017 | 1031 | static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg) |
| 1018 | 1032 | { |
| 1019 | 1033 | unsigned ivalid = iattr->ia_valid; |
| 1020 | 1034 | |
| 1021 | 1035 | |
| ... | ... | @@ -1026,11 +1040,19 @@ |
| 1026 | 1040 | arg->valid |= FATTR_GID, arg->gid = iattr->ia_gid; |
| 1027 | 1041 | if (ivalid & ATTR_SIZE) |
| 1028 | 1042 | arg->valid |= FATTR_SIZE, arg->size = iattr->ia_size; |
| 1029 | - /* You can only _set_ these together (they may change by themselves) */ | |
| 1030 | - if ((ivalid & (ATTR_ATIME | ATTR_MTIME)) == (ATTR_ATIME | ATTR_MTIME)) { | |
| 1031 | - arg->valid |= FATTR_ATIME | FATTR_MTIME; | |
| 1043 | + if (ivalid & ATTR_ATIME) { | |
| 1044 | + arg->valid |= FATTR_ATIME; | |
| 1032 | 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 | 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 |
include/linux/fuse.h