On Wed, 2008-10-08 at 22:10 -0400, J. Bruce Fields wrote:
> On Wed, Oct 08, 2008 at 10:03:00PM -0400, bfields wrote:
> > On Wed, Oct 08, 2008 at 06:55:43PM -0400, bfields wrote:
> > > I'm getting connectathon test failures with the latest merge of code
> > > from both our trees, linux-to-linux over v3 and v4.
> > >
> > > I just got this a moment ago, so haven't tried to track it down at all
> > > yet--but I seem to recall in the past this sort of failure has been an
> > > attribute revalidation problem (usually with the ext3 ctime resolution
> > > at least partly to blame).
> >
> > The failure first happens with d65f557f3 "NFS: Fix
> > nfs_post_op_update_inode_force_wcc()".
>
> Err, sorry, no: that was the last *good* one! It's the following one (
> (4dc05efb86 "NFS: Convert __nfs_revalidate_inode() to use
> nfs_refresh_inode()") where the failures start.
Hmm... That patch should be correct. I rather suspect a problem with the
updating of nfsi->last_updated.
Could you see if something like the following patch helps?
---------------------------------------------------------------------------------
From: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
NFS: Fix attribute updates
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
---
fs/nfs/inode.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index e25009f..d45e7b5 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -933,10 +933,10 @@ static int nfs_inode_attrs_need_update(const struct inode *inode, const struct n
{
const struct nfs_inode *nfsi = NFS_I(inode);
- return nfs_ctime_need_update(inode, fattr) ||
- nfs_size_need_update(inode, fattr) ||
- time_after(fattr->time_start, nfsi->last_updated) ||
- time_after(nfsi->last_updated, jiffies);
+ return time_after(fattr->time_start, nfsi->last_updated) ||
+ nfs_ctime_need_update(inode, fattr) ||
+ nfs_size_need_update(inode, fattr) ||
+ time_after(nfsi->last_updated, jiffies);
}
static int nfs_refresh_inode_locked(struct inode *inode, struct nfs_fattr *fattr)
@@ -1170,8 +1170,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
/*
* Avoid jiffy wraparound issues with nfsi->last_updated
*/
- if (!time_in_range(nfsi->last_updated, nfsi->read_cache_jiffies, now))
- nfsi->last_updated = nfsi->read_cache_jiffies;
+ if (!time_in_range(nfsi->last_updated, now - NFS_MAXATTRTIMEO(inode), now))
+ nfsi->last_updated = now - NFS_MAXATTRTIMEO(inode);
}
invalid &= ~NFS_INO_INVALID_ATTR;
/* Don't invalidate the data if we were to blame */
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@xxxxxxxxxx
www.netapp.com
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
