On Wed, Feb 3, 2016 at 3:34 PM, Yan, Zheng <ukernel@xxxxxxxxx> wrote: > On Wed, Feb 3, 2016 at 2:07 PM, Deepa Dinamani <deepa.kernel@xxxxxxxxx> wrote: >> This is in preparation for the series that transitions >> filesystem timestamps to use 64 bit time and hence make >> them y2038 safe. >> >> CURRENT_TIME macro will be deleted before merging the >> aforementioned series. >> >> Filesystems will use current_fs_time() instead of >> CURRENT_TIME. >> Use ktime_get_real_ts() here as this is not filesystem time. >> ktime_get_real_ts() returns the timestamp in ns which can >> be used to calculate MDS request timestamp. >> >> Signed-off-by: Deepa Dinamani <deepa.kernel@xxxxxxxxx> >> Cc: "Yan, Zheng" <zyan@xxxxxxxxxx> >> Cc: Sage Weil <sage@xxxxxxxxxx> >> Cc: Ilya Dryomov <idryomov@xxxxxxxxx> >> Cc: ceph-devel@xxxxxxxxxxxxxxx >> --- >> fs/ceph/mds_client.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c >> index e7b130a..348b22e 100644 >> --- a/fs/ceph/mds_client.c >> +++ b/fs/ceph/mds_client.c >> @@ -1721,7 +1721,7 @@ ceph_mdsc_create_request(struct ceph_mds_client *mdsc, int op, int mode) >> init_completion(&req->r_safe_completion); >> INIT_LIST_HEAD(&req->r_unsafe_item); >> >> - req->r_stamp = CURRENT_TIME; >> + ktime_get_real_ts(&req->r_stamp); > > I think we should use current_fs_time() here. I have squash the change > into another patch That actually caused me to scratch my head for a second. What you really did is you replaced an older commit of yours (d3f683a74f8e, "ceph: use current_fs_time() to get timestamp", committed on Jan 28) with a new commit, authored by Deepa (3dcf84823f6a, "fs: ceph: replace CURRENT_TIME by current_fs_time()") - the bodies are the same. Is that what you intended to do? -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
