From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751280Ab1BNWNQ (ORCPT ); Mon, 14 Feb 2011 17:13:16 -0500 Received: from swampdragon.chaosbits.net ([90.184.90.115]:11541 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750864Ab1BNWNN (ORCPT ); Mon, 14 Feb 2011 17:13:13 -0500 Date: Mon, 14 Feb 2011 23:12:08 +0100 (CET) From: Jesper Juhl To: Trond Myklebust cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] NFS: Zap entire 'struct inode' in nfs_zap_caches_locked(). In-Reply-To: <1297721385.23841.14.camel@heimdal.trondhjem.org> Message-ID: References: <1297721385.23841.14.camel@heimdal.trondhjem.org> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 14 Feb 2011, Trond Myklebust wrote: > On Mon, 2011-02-14 at 22:56 +0100, Jesper Juhl wrote: > > nfs_zap_caches_locked() attempts to zero all of the 'struct inode' that's > > passed in via the pointer variable 'inode'. Unfortunately it only manages > > to zero the size of a 'pointer to struct inode'. Fix that. > > > > Signed-off-by: Jesper Juhl > > --- > > inode.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > compile tested only > > > > diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c > > index 1cc600e..6c4236e 100644 > > --- a/fs/nfs/inode.c > > +++ b/fs/nfs/inode.c > > @@ -145,7 +145,7 @@ static void nfs_zap_caches_locked(struct inode *inode) > > nfsi->attrtimeo = NFS_MINATTRTIMEO(inode); > > nfsi->attrtimeo_timestamp = jiffies; > > > > - memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode))); > > + memset(NFS_COOKIEVERF(inode), 0, sizeof(*NFS_COOKIEVERF(inode))); > > if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)) > > nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE; > > else > > That's incorrect. > > NFS_COOKIEVERF(inode) expands to NFS_I(inode)->cookieverf, and since > cookieverf is declared inside the struct nfs_inode as > > u32 cookieverf[2]; > > the sizeof(NFS_I(inode)->cookieverf) should expand to the size of the > cookieverf array (i.e. 8 bytes). > Ouch, I completely misread/misunderstood that. Thanks for the clarification and please ignore the patch... -- Jesper Juhl http://www.chaosbits.net/ Plain text mails only, please. Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html