From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH v4 23/26] fs: ceph: Replace current_fs_time for request stamp Date: Sat, 13 Aug 2016 15:48:35 -0700 Message-ID: <1471128518-24075-24-git-send-email-deepa.kernel@gmail.com> References: <1471128518-24075-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: <1471128518-24075-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+ClJldmlld2VkLWJ5OiBBcm5kIEJl cmdtYW5uIDxhcm5kQGFybmRiLmRlPgpDYzogIllhbiwgWmhlbmciIDx6eWFuQHJlZGhhdC5jb20+ CkNjOiBTYWdlIFdlaWwgPHNhZ2VAcmVkaGF0LmNvbT4KQ2M6IElseWEgRHJ5b21vdiA8aWRyeW9t b3ZAZ21haWwuY29tPgpDYzogY2VwaC1kZXZlbEB2Z2VyLmtlcm5lbC5vcmcKLS0tCiBmcy9jZXBo L21kc19jbGllbnQuYyB8IDQgKysrLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwg MSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2ZzL2NlcGgvbWRzX2NsaWVudC5jIGIvZnMvY2Vw aC9tZHNfY2xpZW50LmMKaW5kZXggZmE1OWE4NS4uMDE1ZGIzOSAxMDA2NDQKLS0tIGEvZnMvY2Vw aC9tZHNfY2xpZW50LmMKKysrIGIvZnMvY2VwaC9tZHNfY2xpZW50LmMKQEAgLTE2NDAsNiArMTY0 MCw3IEBAIHN0cnVjdCBjZXBoX21kc19yZXF1ZXN0ICoKIGNlcGhfbWRzY19jcmVhdGVfcmVxdWVz dChzdHJ1Y3QgY2VwaF9tZHNfY2xpZW50ICptZHNjLCBpbnQgb3AsIGludCBtb2RlKQogewogCXN0 cnVjdCBjZXBoX21kc19yZXF1ZXN0ICpyZXEgPSBremFsbG9jKHNpemVvZigqcmVxKSwgR0ZQX05P RlMpOworCXN0cnVjdCB0aW1lc3BlYyB0czsKIAogCWlmICghcmVxKQogCQlyZXR1cm4gRVJSX1BU UigtRU5PTUVNKTsKQEAgLTE2NTgsNyArMTY1OSw4IEBAIGNlcGhfbWRzY19jcmVhdGVfcmVxdWVz dChzdHJ1Y3QgY2VwaF9tZHNfY2xpZW50ICptZHNjLCBpbnQgb3AsIGludCBtb2RlKQogCWluaXRf Y29tcGxldGlvbigmcmVxLT5yX3NhZmVfY29tcGxldGlvbik7CiAJSU5JVF9MSVNUX0hFQUQoJnJl cS0+cl91bnNhZmVfaXRlbSk7CiAKLQlyZXEtPnJfc3RhbXAgPSBjdXJyZW50X2ZzX3RpbWUobWRz Yy0+ZnNjLT5zYik7CisJa3RpbWVfZ2V0X3JlYWxfdHMoJnRzKTsKKwlyZXEtPnJfc3RhbXAgPSB0 aW1lc3BlY190cnVuYyh0cywgbWRzYy0+ZnNjLT5zYi0+c190aW1lX2dyYW4pOwogCiAJcmVxLT5y X29wID0gb3A7CiAJcmVxLT5yX2RpcmVjdF9tb2RlID0gbW9kZTsKLS0gCjEuOS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpZMjAzOCBtYWlsaW5nIGxp c3QKWTIwMzhAbGlzdHMubGluYXJvLm9yZwpodHRwczovL2xpc3RzLmxpbmFyby5vcmcvbWFpbG1h bi9saXN0aW5mby95MjAzOAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f66.google.com ([209.85.220.66]:33538 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752807AbcHNKpN (ORCPT ); Sun, 14 Aug 2016 06:45:13 -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 v4 23/26] fs: ceph: Replace current_fs_time for request stamp Date: Sat, 13 Aug 2016 15:48:35 -0700 Message-Id: <1471128518-24075-24-git-send-email-deepa.kernel@gmail.com> In-Reply-To: <1471128518-24075-1-git-send-email-deepa.kernel@gmail.com> References: <1471128518-24075-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 Reviewed-by: Arnd Bergmann 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 fa59a85..015db39 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -1640,6 +1640,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); @@ -1658,7 +1659,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