From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andi Kleen Subject: [PATCH 1/7] BTRFS: Fix lseek return value for error Date: Mon, 22 Aug 2011 13:49:06 -0700 Message-ID: <1314046152-2175-2-git-send-email-andi@firstfloor.org> References: <1314046152-2175-1-git-send-email-andi@firstfloor.org> Cc: hch@infradead.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Kleen To: viro@zeniv.linux.org.uk Return-path: Received: from mga02.intel.com ([134.134.136.20]:47558 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753575Ab1HVUta (ORCPT ); Mon, 22 Aug 2011 16:49:30 -0400 In-Reply-To: <1314046152-2175-1-git-send-email-andi@firstfloor.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Andi Kleen Introduced by 9a4327ca1f45f82edad7dc0a4e52ce9316e0950c 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 e7872e4..c6e493f 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1814,19 +1814,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? */ @@ -1837,6 +1835,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