diff options
| author |   David Disseldorp <ddiss@suse.de> | 2019-04-18 14:15:46 +0200 |
|---|---|---|
| committer |   Ilya Dryomov <idryomov@gmail.com> | 2019-07-08 14:01:40 +0200 |
| commit | 193e7b37628e97c6e66ec26a2c062dace68b4acd (patch) | |
| tree | 24bcc4b4dc2d768479ab76a1e7e1609c6319059b /fs/ceph | |
| parent | ceph: clean up ceph.dir.pin vxattr name sizeof() (diff) | |
| download | linux-dev-193e7b37628e97c6e66ec26a2c062dace68b4acd.tar.xz linux-dev-193e7b37628e97c6e66ec26a2c062dace68b4acd.zip | |
ceph: carry snapshot creation time with inodes
MDS InodeStat v3 wire structures include a trailing snapshot creation
time member. Unmarshall this and retain it for a future vxattr.
Signed-off-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/inode.c | 1 | ||||
| -rw-r--r-- | fs/ceph/mds_client.c | 10 | ||||
| -rw-r--r-- | fs/ceph/mds_client.h | 1 | ||||
| -rw-r--r-- | fs/ceph/super.h | 1 |
4 files changed, 13 insertions, 0 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 761451f36e2d..eb35d47d4e2e 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -813,6 +813,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page, dout("%p mode 0%o uid.gid %d.%d\n", inode, inode->i_mode, from_kuid(&init_user_ns, inode->i_uid), from_kgid(&init_user_ns, inode->i_gid)); + ceph_decode_timespec64(&ci->i_snap_btime, &iinfo->snap_btime); } if ((new_version || (new_issued & CEPH_CAP_LINK_SHARED)) && diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index c8a9b89b922d..0b78507eccb0 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -166,6 +166,15 @@ static int parse_reply_info_in(void **p, void *end, info->dir_pin = -ENODATA; } + /* snapshot birth time, remains zero for v<=2 */ + if (struct_v >= 3) { + ceph_decode_need(p, end, sizeof(info->snap_btime), bad); + ceph_decode_copy(p, &info->snap_btime, + sizeof(info->snap_btime)); + } else { + memset(&info->snap_btime, 0, sizeof(info->snap_btime)); + } + *p = end; } else { if (features & CEPH_FEATURE_MDS_INLINE_DATA) { @@ -198,6 +207,7 @@ static int parse_reply_info_in(void **p, void *end, } info->dir_pin = -ENODATA; + /* info->snap_btime remains zero */ } return 0; bad: diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h index a83f28bc2387..9c28b86abcf4 100644 --- a/fs/ceph/mds_client.h +++ b/fs/ceph/mds_client.h @@ -69,6 +69,7 @@ struct ceph_mds_reply_info_in { u64 max_bytes; u64 max_files; s32 dir_pin; + struct ceph_timespec snap_btime; }; struct ceph_mds_reply_dir_entry { diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 5f27e1f7f2d6..1de6b1f4f094 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -384,6 +384,7 @@ struct ceph_inode_info { int i_snap_realm_counter; /* snap realm (if caps) */ struct list_head i_snap_realm_item; struct list_head i_snap_flush_item; + struct timespec64 i_snap_btime; struct work_struct i_work; unsigned long i_work_mask; |