| From: "Yan, Zheng" <zyan@redhat.com> |
| Date: Mon, 26 Mar 2018 16:46:39 +0800 |
| Subject: ceph: always update atime/mtime/ctime for new inode |
| |
| commit ffdeec7aa41aa61ca4ee68fddf4669df9ce661d1 upstream. |
| |
| For new inode, atime/mtime/ctime are uninitialized. Don't compare |
| against them. |
| |
| Signed-off-by: "Yan, Zheng" <zyan@redhat.com> |
| Reviewed-by: Ilya Dryomov <idryomov@gmail.com> |
| Signed-off-by: Ilya Dryomov <idryomov@gmail.com> |
| [bwh: Backported to 3.16: adjust context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| fs/ceph/inode.c | 10 +++++++--- |
| 1 file changed, 7 insertions(+), 3 deletions(-) |
| |
| --- a/fs/ceph/inode.c |
| +++ b/fs/ceph/inode.c |
| @@ -599,13 +599,15 @@ void ceph_fill_file_time(struct inode *i |
| CEPH_CAP_FILE_BUFFER| |
| CEPH_CAP_AUTH_EXCL| |
| CEPH_CAP_XATTR_EXCL)) { |
| - if (timespec_compare(ctime, &inode->i_ctime) > 0) { |
| + if (ci->i_version == 0 || |
| + timespec_compare(ctime, &inode->i_ctime) > 0) { |
| dout("ctime %ld.%09ld -> %ld.%09ld inc w/ cap\n", |
| inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec, |
| ctime->tv_sec, ctime->tv_nsec); |
| inode->i_ctime = *ctime; |
| } |
| - if (ceph_seq_cmp(time_warp_seq, ci->i_time_warp_seq) > 0) { |
| + if (ci->i_version == 0 || |
| + ceph_seq_cmp(time_warp_seq, ci->i_time_warp_seq) > 0) { |
| /* the MDS did a utimes() */ |
| dout("mtime %ld.%09ld -> %ld.%09ld " |
| "tw %d -> %d\n", |
| @@ -719,7 +721,6 @@ static int fill_inode(struct inode *inod |
| new_issued = ~issued & le32_to_cpu(info->cap.caps); |
| |
| /* update inode */ |
| - ci->i_version = le64_to_cpu(info->version); |
| inode->i_version++; |
| inode->i_rdev = le32_to_cpu(info->rdev); |
| inode->i_blkbits = fls(le32_to_cpu(info->layout.fl_stripe_unit)) - 1; |
| @@ -779,6 +780,9 @@ static int fill_inode(struct inode *inod |
| xattr_blob = NULL; |
| } |
| |
| + /* finally update i_version */ |
| + ci->i_version = le64_to_cpu(info->version); |
| + |
| inode->i_mapping->a_ops = &ceph_aops; |
| inode->i_mapping->backing_dev_info = |
| &ceph_sb_to_client(inode->i_sb)->backing_dev_info; |