From: Andres Freund Subject: [PATCH 2/2] btrfs: Don't have multiple paths to error out in btrfs_file_llseek Date: Sat, 1 Oct 2011 22:50:04 +0200 Message-ID: <201110012250.04307.andres@anarazel.de> References: <1316128013-21980-1-git-send-email-andi@firstfloor.org> <201110012246.13801.andres@anarazel.de> Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Cc: robertmhaas@gmail.com, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org To: Andi Kleen Return-path: In-Reply-To: <201110012246.13801.andres@anarazel.de> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Using multiple paths seems to invite overlooking one when adding new stuff in the future. Signed-of-by: Andres Freund --- fs/btrfs/file.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 5bc7116..701c633 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1814,14 +1814,14 @@ static loff_t btrfs_file_llseek(struct file *file, loff_t offset, int origin) mutex_lock(&inode->i_mutex); if (offset >= i_size_read(inode)) { - mutex_unlock(&inode->i_mutex); - return -ENXIO; + offset = -ENXIO; + goto out; } ret = find_desired_extent(inode, &offset, origin); if (ret) { - mutex_unlock(&inode->i_mutex); - return ret; + offset = ret; + goto out; } if (offset < 0 && !(file->f_mode & FMODE_UNSIGNED_OFFSET)) { -- 1.7.6.409.ge7a85.dirty