On Mon, Sep 16, 2013 at 02:17:49PM +0100, Steven Whitehouse wrote:
> Hi,
>
> On Mon, 2013-09-16 at 14:52 +0200, Miklos Szeredi wrote:
> > From: Miklos Szeredi <mszeredi@xxxxxxx>
> >
> > unless it was given an IS_ERR(inode), which isn't the case here. So clean
> > up the unnecessary error handling in gfs2_create_inode().
> >
> > This paves the way for real fixes (hence the stable Cc).
> >
> That makes send to me:
>
> Acked-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
>
> I can put this in the gfs2 tree if that makes sense to do,
Sure, please do.
Thanks,
Miklos
> Steve.
>
> > Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
> > Cc: Steven Whitehouse <swhiteho@xxxxxxxxxx>
> > Cc: stable@xxxxxxxxxxxxxxx
> > ---
> > fs/gfs2/inode.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
> > index 64915ee..6d7f976 100644
> > --- a/fs/gfs2/inode.c
> > +++ b/fs/gfs2/inode.c
> > @@ -584,7 +584,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
> > if (!IS_ERR(inode)) {
> > d = d_splice_alias(inode, dentry);
> > error = 0;
> > - if (file && !IS_ERR(d)) {
> > + if (file) {
> > if (d == NULL)
> > d = dentry;
> > if (S_ISREG(inode->i_mode))
> > @@ -593,8 +593,6 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
> > error = finish_no_open(file, d);
> > }
> > gfs2_glock_dq_uninit(ghs);
> > - if (IS_ERR(d))
> > - return PTR_ERR(d);
> > return error;
> > } else if (error != -ENOENT) {
> > goto fail_gunlock;
>
>
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html