From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH v2 22/24] fs: ceph: Replace current_fs_time for request stamp Date: Sun, 19 Jun 2016 17:27:21 -0700 Message-ID: <1466382443-11063-23-git-send-email-deepa.kernel@gmail.com> References: <1466382443-11063-1-git-send-email-deepa.kernel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1466382443-11063-1-git-send-email-deepa.kernel@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: y2038-bounces@lists.linaro.org Sender: "Y2038" To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tytso@mit.edu, Sage Weil , arnd@arndb.de, y2038@lists.linaro.org, ceph-devel@vger.kernel.org, "Yan, Zheng" , viro@zeniv.linux.org.uk, tglx@linutronix.de, torvalds@linux-foundation.org, Ilya Dryomov List-Id: ceph-devel.vger.kernel.org VGhlIGN1cnJlbnRfZnNfdGltZSgpIGFwaSBpcyBiZWluZyBjaGFuZ2VkIHRvIHVzZSB2ZnMKc3Ry dWN0IGlub2RlKiBhcyBhbiBhcmd1bWVudCBpbnN0ZWFkIG9mIHN0cnVjdCBzdXBlcl9ibG9jayou CgpTZXQgdGhlIG5ldyBtZHMgY2xpZW50IHJlcXVlc3Qgcl9zdGFtcCBmaWVsZCB1c2luZwprdGlt ZV9nZXRfcmVhbF90cygpIGluc3RlYWQgb2YgdXNpbmcgY3VycmVudF9mc190aW1lKCkuCgpBbHNv LCBzaW5jZSByX3N0YW1wIGlzIHVzZWQgYXMgbXRpbWUgb24gdGhlIHNlcnZlciwgdXNlCnRpbWVz cGVjX3RydW5jKCkgdG8gdHJ1bmNhdGUgdGhlIHRpbWVzdGFtcCwgdXNpbmcgdGhlIHJpZ2h0Cmdy YW51bGFyaXR5IGZyb20gdGhlIHN1cGVyYmxvY2suCgpUaGlzIGFwaSB3aWxsIGJlIHRyYW5zaXRp b25lZCB0byBiZSB5MjAzOCBzYWZlIGFsb25nCndpdGggdmZzLgoKU2lnbmVkLW9mZi1ieTogRGVl cGEgRGluYW1hbmkgPGRlZXBhLmtlcm5lbEBnbWFpbC5jb20+CkNjOiAiWWFuLCBaaGVuZyIgPHp5 YW5AcmVkaGF0LmNvbT4KQ2M6IFNhZ2UgV2VpbCA8c2FnZUByZWRoYXQuY29tPgpDYzogSWx5YSBE cnlvbW92IDxpZHJ5b21vdkBnbWFpbC5jb20+CkNjOiBjZXBoLWRldmVsQHZnZXIua2VybmVsLm9y ZwotLS0KIGZzL2NlcGgvbWRzX2NsaWVudC5jIHwgNCArKystCiAxIGZpbGUgY2hhbmdlZCwgMyBp bnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZnMvY2VwaC9tZHNfY2xp ZW50LmMgYi9mcy9jZXBoL21kc19jbGllbnQuYwppbmRleCAyMTAzYjgyLi5jNmNhZTdhIDEwMDY0 NAotLS0gYS9mcy9jZXBoL21kc19jbGllbnQuYworKysgYi9mcy9jZXBoL21kc19jbGllbnQuYwpA QCAtMTY5Nyw2ICsxNjk3LDcgQEAgc3RydWN0IGNlcGhfbWRzX3JlcXVlc3QgKgogY2VwaF9tZHNj X2NyZWF0ZV9yZXF1ZXN0KHN0cnVjdCBjZXBoX21kc19jbGllbnQgKm1kc2MsIGludCBvcCwgaW50 IG1vZGUpCiB7CiAJc3RydWN0IGNlcGhfbWRzX3JlcXVlc3QgKnJlcSA9IGt6YWxsb2Moc2l6ZW9m KCpyZXEpLCBHRlBfTk9GUyk7CisJc3RydWN0IHRpbWVzcGVjIHRzOwogCiAJaWYgKCFyZXEpCiAJ CXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwpAQCAtMTcxNSw3ICsxNzE2LDggQEAgY2VwaF9tZHNj X2NyZWF0ZV9yZXF1ZXN0KHN0cnVjdCBjZXBoX21kc19jbGllbnQgKm1kc2MsIGludCBvcCwgaW50 IG1vZGUpCiAJaW5pdF9jb21wbGV0aW9uKCZyZXEtPnJfc2FmZV9jb21wbGV0aW9uKTsKIAlJTklU X0xJU1RfSEVBRCgmcmVxLT5yX3Vuc2FmZV9pdGVtKTsKIAotCXJlcS0+cl9zdGFtcCA9IGN1cnJl bnRfZnNfdGltZShtZHNjLT5mc2MtPnNiKTsKKwlrdGltZV9nZXRfcmVhbF90cygmdHMpOworCXJl cS0+cl9zdGFtcCA9IHRpbWVzcGVjX3RydW5jKHRzLCBtZHNjLT5mc2MtPnNiLT5zX3RpbWVfZ3Jh bik7CiAKIAlyZXEtPnJfb3AgPSBvcDsKIAlyZXEtPnJfZGlyZWN0X21vZGUgPSBtb2RlOwotLSAK MS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClky MDM4IG1haWxpbmcgbGlzdApZMjAzOEBsaXN0cy5saW5hcm8ub3JnCmh0dHBzOi8vbGlzdHMubGlu YXJvLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3kyMDM4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com ([209.85.192.196]:34907 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751525AbcFTAmP (ORCPT ); Sun, 19 Jun 2016 20:42:15 -0400 From: Deepa Dinamani To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, tglx@linutronix.de, torvalds@linux-foundation.org, tytso@mit.edu, viro@zeniv.linux.org.uk, y2038@lists.linaro.org, "Yan, Zheng" , Sage Weil , Ilya Dryomov , ceph-devel@vger.kernel.org Subject: [PATCH v2 22/24] fs: ceph: Replace current_fs_time for request stamp Date: Sun, 19 Jun 2016 17:27:21 -0700 Message-Id: <1466382443-11063-23-git-send-email-deepa.kernel@gmail.com> In-Reply-To: <1466382443-11063-1-git-send-email-deepa.kernel@gmail.com> References: <1466382443-11063-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: The current_fs_time() api is being changed to use vfs struct inode* as an argument instead of struct super_block*. Set the new mds client request r_stamp field using ktime_get_real_ts() instead of using current_fs_time(). Also, since r_stamp is used as mtime on the server, use timespec_trunc() to truncate the timestamp, using the right granularity from the superblock. This api will be transitioned to be y2038 safe along with vfs. Signed-off-by: Deepa Dinamani Cc: "Yan, Zheng" Cc: Sage Weil Cc: Ilya Dryomov Cc: ceph-devel@vger.kernel.org --- fs/ceph/mds_client.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 2103b82..c6cae7a 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -1697,6 +1697,7 @@ struct ceph_mds_request * ceph_mdsc_create_request(struct ceph_mds_client *mdsc, int op, int mode) { struct ceph_mds_request *req = kzalloc(sizeof(*req), GFP_NOFS); + struct timespec ts; if (!req) return ERR_PTR(-ENOMEM); @@ -1715,7 +1716,8 @@ 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_fs_time(mdsc->fsc->sb); + ktime_get_real_ts(&ts); + req->r_stamp = timespec_trunc(ts, mdsc->fsc->sb->s_time_gran); req->r_op = op; req->r_direct_mode = mode; -- 1.9.1