Commit 9fdbfad1 authored by Trond Myklebust's avatar Trond Myklebust

NFS: Deal correctly with attribute generation counter overflow

We need to use unsigned long subtraction and then convert to signed in
order to deal correcly with C overflow rules.

Fixes: f5062003 ("NFS: Set an attribute barrier on all updates")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 99f23783
...@@ -1662,10 +1662,10 @@ EXPORT_SYMBOL_GPL(_nfs_display_fhandle); ...@@ -1662,10 +1662,10 @@ EXPORT_SYMBOL_GPL(_nfs_display_fhandle);
*/ */
static int nfs_inode_attrs_need_update(const struct inode *inode, const struct nfs_fattr *fattr) static int nfs_inode_attrs_need_update(const struct inode *inode, const struct nfs_fattr *fattr)
{ {
const struct nfs_inode *nfsi = NFS_I(inode); unsigned long attr_gencount = NFS_I(inode)->attr_gencount;
return ((long)fattr->gencount - (long)nfsi->attr_gencount) > 0 || return (long)(fattr->gencount - attr_gencount) > 0 ||
((long)nfsi->attr_gencount - (long)nfs_read_attr_generation_counter() > 0); (long)(attr_gencount - nfs_read_attr_generation_counter()) > 0;
} }
static int nfs_refresh_inode_locked(struct inode *inode, struct nfs_fattr *fattr) static int nfs_refresh_inode_locked(struct inode *inode, struct nfs_fattr *fattr)
...@@ -2094,7 +2094,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) ...@@ -2094,7 +2094,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
nfsi->attrtimeo_timestamp = now; nfsi->attrtimeo_timestamp = now;
} }
/* Set the barrier to be more recent than this fattr */ /* Set the barrier to be more recent than this fattr */
if ((long)fattr->gencount - (long)nfsi->attr_gencount > 0) if ((long)(fattr->gencount - nfsi->attr_gencount) > 0)
nfsi->attr_gencount = fattr->gencount; nfsi->attr_gencount = fattr->gencount;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment