diff --git a/[refs] b/[refs] index 8808c503069b..325b469ffd9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe6e9c1f25ac01f848bd084ee0ee62a5a0966ff3 +refs/heads/master: 12fd0d3088d27867be68655bcab2b074f2835f60 diff --git a/trunk/fs/utimes.c b/trunk/fs/utimes.c index af059d5cb485..14d3edbb3d7c 100644 --- a/trunk/fs/utimes.c +++ b/trunk/fs/utimes.c @@ -102,6 +102,10 @@ long do_utimes(int dfd, char __user *filename, struct timespec *times, int flags if (error) goto dput_and_out; + if (times && times[0].tv_nsec == UTIME_NOW && + times[1].tv_nsec == UTIME_NOW) + times = NULL; + /* Don't worry, the checks are done in inode_change_ok() */ newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME; if (times) {