diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 08:23:02 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 08:23:02 +0900 |
| commit | 6e203506599bdd1e73f4850d94ccc762980fd9cd (patch) | |
| tree | e020dea6c506643f3f3e2df24ef188a2e4804fce /fs/ceph/acl.c | |
| parent | adc311034c356e884d180df25deb046cef3e8c75 (diff) | |
| parent | 4ca2fea6f8277ab381bd08b996d641255b6f7b00 (diff) | |
Merge tag 'ceph-for-4.12-rc6' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"A fix for an old ceph ->fh_to_* bug from Luis and two timestamp fixups
from Zheng, prompted by the ongoing y2038 work"
* tag 'ceph-for-4.12-rc6' of git://github.com/ceph/ceph-client:
ceph: unify inode i_ctime update
ceph: use current_kernel_time() to get request time stamp
ceph: check i_nlink while converting a file handle to dentry
Diffstat (limited to 'fs/ceph/acl.c')
| -rw-r--r-- | fs/ceph/acl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c index 987044bca1c2..59cb307b15fb 100644 --- a/fs/ceph/acl.c +++ b/fs/ceph/acl.c @@ -131,6 +131,7 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type) } if (new_mode != old_mode) { + newattrs.ia_ctime = current_time(inode); newattrs.ia_mode = new_mode; newattrs.ia_valid = ATTR_MODE; ret = __ceph_setattr(inode, &newattrs); |