From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755269Ab1IPPsV (ORCPT ); Fri, 16 Sep 2011 11:48:21 -0400 Received: from 173-166-109-252-newengland.hfc.comcastbusiness.net ([173.166.109.252]:51592 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754661Ab1IPPsU (ORCPT ); Fri, 16 Sep 2011 11:48:20 -0400 Date: Fri, 16 Sep 2011 11:48:15 -0400 From: Christoph Hellwig To: Andi Kleen Cc: viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Kleen , linux-btrfs@vger.kernel.org Subject: Re: [PATCH 1/7] BTRFS: Fix lseek return value for error Message-ID: <20110916154815.GA27150@infradead.org> References: <1316128013-21980-1-git-send-email-andi@firstfloor.org> <1316128013-21980-2-git-send-email-andi@firstfloor.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1316128013-21980-2-git-send-email-andi@firstfloor.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 15, 2011 at 04:06:47PM -0700, Andi Kleen wrote: > From: Andi Kleen > > Introduced by 9a4327ca1f45f82edad7dc0a4e52ce9316e0950c I think this should go to Chris/Linus ASAP. But a slightly better patch description wouldn't hurt either. Also any reason you captialize BTRFS? > > Signed-off-by: Andi Kleen > --- > fs/btrfs/file.c | 13 +++++++------ > 1 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c > index 3c3abff..7ec0a24 100644 > --- a/fs/btrfs/file.c > +++ b/fs/btrfs/file.c > @@ -1818,19 +1818,17 @@ static loff_t btrfs_file_llseek(struct file *file, loff_t offset, int origin) > case SEEK_DATA: > case SEEK_HOLE: > ret = find_desired_extent(inode, &offset, origin); > - if (ret) { > - mutex_unlock(&inode->i_mutex); > - return ret; > - } > + if (ret) > + goto error; > } > > if (offset < 0 && !(file->f_mode & FMODE_UNSIGNED_OFFSET)) { > ret = -EINVAL; > - goto out; > + goto error; > } > if (offset > inode->i_sb->s_maxbytes) { > ret = -EINVAL; > - goto out; > + goto error; > } > > /* Special lock needed here? */ > @@ -1841,6 +1839,9 @@ static loff_t btrfs_file_llseek(struct file *file, loff_t offset, int origin) > out: > mutex_unlock(&inode->i_mutex); > return offset; > +error: > + mutex_unlock(&inode->i_mutex); > + return ret; > } > > const struct file_operations btrfs_file_operations = { > -- > 1.7.4.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ---end quoted text---