From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751734AbcFWGVN (ORCPT ); Thu, 23 Jun 2016 02:21:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46243 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751691AbcFWGVM convert rfc822-to-8bit (ORCPT ); Thu, 23 Jun 2016 02:21:12 -0400 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Subject: Re: [PATCH 2/8] ceph: don't use ->d_time From: "Yan, Zheng" In-Reply-To: <1466606110-24297-3-git-send-email-mszeredi@redhat.com> Date: Thu, 23 Jun 2016 14:21:04 +0800 Cc: Al Viro , linux-kernel , linux-fsdevel@vger.kernel.org Content-Transfer-Encoding: 8BIT Message-Id: References: <1466606110-24297-1-git-send-email-mszeredi@redhat.com> <1466606110-24297-3-git-send-email-mszeredi@redhat.com> To: Miklos Szeredi X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 23 Jun 2016 06:21:10 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > On Jun 22, 2016, at 22:35, Miklos Szeredi wrote: > > Pretty simple: just use ceph_dentry_info.time instead (which was already > there, unused). > > Signed-off-by: Miklos Szeredi > Cc: Yan, Zheng > --- > fs/ceph/dir.c | 6 +++--- > fs/ceph/inode.c | 4 ++-- > fs/ceph/mds_client.c | 4 ++-- > fs/ceph/super.h | 2 +- > 4 files changed, 8 insertions(+), 8 deletions(-) Reviewed-by: Yan, Zheng > > diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c > index 6e0fedf6713b..8ff7bcc7fc88 100644 > --- a/fs/ceph/dir.c > +++ b/fs/ceph/dir.c > @@ -59,7 +59,7 @@ int ceph_init_dentry(struct dentry *dentry) > > di->dentry = dentry; > di->lease_session = NULL; > - dentry->d_time = jiffies; > + di->time = jiffies; > /* avoid reordering d_fsdata setup so that the check above is safe */ > smp_mb(); > dentry->d_fsdata = di; > @@ -1124,7 +1124,7 @@ static int ceph_rename(struct inode *old_dir, struct dentry *old_dentry, > void ceph_invalidate_dentry_lease(struct dentry *dentry) > { > spin_lock(&dentry->d_lock); > - dentry->d_time = jiffies; > + ceph_dentry(dentry)->time = jiffies; > ceph_dentry(dentry)->lease_shared_gen = 0; > spin_unlock(&dentry->d_lock); > } > @@ -1154,7 +1154,7 @@ static int dentry_lease_is_valid(struct dentry *dentry) > spin_unlock(&s->s_gen_ttl_lock); > > if (di->lease_gen == gen && > - time_before(jiffies, dentry->d_time) && > + time_before(jiffies, di->time) && > time_before(jiffies, ttl)) { > valid = 1; > if (di->lease_renew_after && > diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c > index f059b5997072..7a33178ef850 100644 > --- a/fs/ceph/inode.c > +++ b/fs/ceph/inode.c > @@ -1018,7 +1018,7 @@ static void update_dentry_lease(struct dentry *dentry, > goto out_unlock; > > if (di->lease_gen == session->s_cap_gen && > - time_before(ttl, dentry->d_time)) > + time_before(ttl, di->time)) > goto out_unlock; /* we already have a newer lease. */ > > if (di->lease_session && di->lease_session != session) > @@ -1032,7 +1032,7 @@ static void update_dentry_lease(struct dentry *dentry, > di->lease_seq = le32_to_cpu(lease->seq); > di->lease_renew_after = half_ttl; > di->lease_renew_from = 0; > - dentry->d_time = ttl; > + di->time = ttl; > out_unlock: > spin_unlock(&dentry->d_lock); > return; > diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c > index 2103b823bec0..db9c654d42cd 100644 > --- a/fs/ceph/mds_client.c > +++ b/fs/ceph/mds_client.c > @@ -3231,7 +3231,7 @@ static void handle_lease(struct ceph_mds_client *mdsc, > msecs_to_jiffies(le32_to_cpu(h->duration_ms)); > > di->lease_seq = seq; > - dentry->d_time = di->lease_renew_from + duration; > + di->time = di->lease_renew_from + duration; > di->lease_renew_after = di->lease_renew_from + > (duration >> 1); > di->lease_renew_from = 0; > @@ -3316,7 +3316,7 @@ void ceph_mdsc_lease_release(struct ceph_mds_client *mdsc, struct inode *inode, > if (!di || !di->lease_session || > di->lease_session->s_mds < 0 || > di->lease_gen != di->lease_session->s_cap_gen || > - !time_before(jiffies, dentry->d_time)) { > + !time_before(jiffies, di->time)) { > dout("lease_release inode %p dentry %p -- " > "no lease\n", > inode, dentry); > diff --git a/fs/ceph/super.h b/fs/ceph/super.h > index 0168b49fb6ad..10776db93143 100644 > --- a/fs/ceph/super.h > +++ b/fs/ceph/super.h > @@ -246,7 +246,7 @@ struct ceph_dentry_info { > unsigned long lease_renew_after, lease_renew_from; > struct list_head lru; > struct dentry *dentry; > - u64 time; > + unsigned long time; > u64 offset; > }; > > -- > 2.5.5 >