Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752911Ab3IPNNK (ORCPT ); Mon, 16 Sep 2013 09:13:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29450 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751207Ab3IPNNH (ORCPT ); Mon, 16 Sep 2013 09:13:07 -0400 Subject: Re: [PATCH 07/11] gfs2: pass correct dentry to finish_open() in __gfs2_lookup() From: Steven Whitehouse To: Miklos Szeredi Cc: viro@ZenIV.linux.org.uk, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, mszeredi@suse.cz, stable@vger.kernel.org In-Reply-To: <1379335925-30858-8-git-send-email-miklos@szeredi.hu> References: <1379335925-30858-1-git-send-email-miklos@szeredi.hu> <1379335925-30858-8-git-send-email-miklos@szeredi.hu> Content-Type: text/plain; charset="UTF-8" Organization: Red Hat UK Ltd Date: Mon, 16 Sep 2013 14:13:14 +0100 Message-ID: <1379337194.2718.16.camel@menhir> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1513 Lines: 43 Hi, On Mon, 2013-09-16 at 14:52 +0200, Miklos Szeredi wrote: > From: Miklos Szeredi > > AFAICS if d_splice_alias() returned non-NULL, this code would Oops > (finish_open expects an instantiated dentry). > > Signed-off-by: Miklos Szeredi > Cc: Steven Whitehouse > Cc: stable@vger.kernel.org > --- > fs/gfs2/inode.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c > index 6d7f976..abe7dae 100644 > --- a/fs/gfs2/inode.c > +++ b/fs/gfs2/inode.c > @@ -774,7 +774,7 @@ static struct dentry *__gfs2_lookup(struct inode *dir, struct dentry *dentry, > > d = d_splice_alias(inode, dentry); > if (file && S_ISREG(inode->i_mode)) > - error = finish_open(file, dentry, gfs2_open_common, opened); > + error = finish_open(file, d ? d : dentry, gfs2_open_common, opened); > > gfs2_glock_dq_uninit(&gh); > if (error) Not sure I understand why this is required... when the inode is a regular file, d can only be an error (if the inode is an error) or it will be NULL. Since the __gfs2_lookup would terminate further up if the inode were an error, then d must always be NULL in the regular file case, so I'm not sure that this is a bug, Steve. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/