All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andres Freund <andres@anarazel.de>
To: Andi Kleen <andi@firstfloor.org>
Cc: robertmhaas@gmail.com, viro@zeniv.linux.org.uk,
	linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
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	[thread overview]
Message-ID: <201110012250.04307.andres@anarazel.de> (raw)
In-Reply-To: <201110012246.13801.andres@anarazel.de>

Using multiple paths seems to invite overlooking one when adding new
stuff in the future.

Signed-of-by: Andres Freund <andres@anarazel.de>
---
 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


  parent reply	other threads:[~2011-10-01 20:50 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-15 23:06 Improve lseek scalability v3 Andi Kleen
2011-09-15 23:06 ` [PATCH 1/7] BTRFS: Fix lseek return value for error Andi Kleen
2011-09-15 23:47   ` Thomas Gleixner
2011-09-16 15:48   ` Christoph Hellwig
2011-09-16 16:38     ` Andi Kleen
2011-09-17  6:10     ` Jeff Liu
2011-09-17 23:03       ` Andreas Dilger
2011-09-18  1:46         ` Andi Kleen
2011-09-18  7:29           ` Jeff Liu
2011-09-18  8:42             ` Marco Stornelli
2011-09-18 10:33               ` Jeff liu
2011-09-18 10:33                 ` Jeff liu
2011-09-18 14:55                 ` Chris Mason
2011-09-18 14:55                   ` Chris Mason
2011-09-18 14:55                   ` Chris Mason
2011-09-19 17:52                   ` Andi Kleen
2011-09-19 19:30                     ` Chris Mason
2011-09-19 19:59                       ` Andi Kleen
2011-09-19 22:55                         ` Chris Mason
2011-09-15 23:06 ` [PATCH 2/7] VFS: Do (nearly) lockless generic_file_llseek Andi Kleen
2011-09-15 23:06 ` [PATCH 3/7] VFS: Make generic lseek lockless safe Andi Kleen
2011-09-15 23:06 ` [PATCH 4/7] VFS: Add generic_file_llseek_size Andi Kleen
2011-09-16 15:50   ` Christoph Hellwig
2011-09-15 23:06 ` [PATCH 5/7] LSEEK: EXT4: Replace cut'n'pasted llseek code with generic_file_llseek_size Andi Kleen
2011-09-15 23:06 ` [PATCH 6/7] LSEEK: NFS: Drop unnecessary locking in llseek Andi Kleen
2011-09-15 23:06 ` [PATCH 7/7] LSEEK: BTRFS: Avoid i_mutex for SEEK_{CUR,SET,END} Andi Kleen
2011-09-16 13:00 ` Improve lseek scalability v3 Matthew Wilcox
2011-09-16 13:19   ` Josef Bacik
2011-09-16 14:16   ` Andres Freund
2011-09-16 14:23     ` Andi Kleen
2011-09-16 14:41       ` Andres Freund
2011-09-16 15:36     ` Matthew Wilcox
2011-09-16 17:27       ` Andres Freund
2011-09-16 17:39         ` [HACKERS] " Alvaro Herrera
2011-09-16 17:39           ` Alvaro Herrera
2011-09-16 17:50           ` [HACKERS] " Andi Kleen
2011-09-16 20:08         ` Benjamin LaHaise
2011-09-16 21:02           ` Andres Freund
2011-09-16 21:05             ` [HACKERS] " Andres Freund
2011-09-16 22:44           ` Greg Stark
2011-09-19 12:31           ` [HACKERS] " Stephen Frost
2011-09-19 12:31             ` Stephen Frost
2011-09-19 13:25             ` [HACKERS] " Matthew Wilcox
2011-09-20  7:18               ` Marco Stornelli
2011-09-20  7:18                 ` Marco Stornelli
2011-09-19 13:30             ` Robert Haas
2011-09-16 14:26   ` Andres Freund
2011-10-01 20:46 ` Andres Freund
2011-10-01 20:49   ` [PATCH 1/2] LSEEK: BTRFS: Avoid i_mutex for SEEK_{CUR,SET,END} Andres Freund
2011-11-02  8:29     ` Christoph Hellwig
2011-11-05 15:27       ` Chris Mason
2012-03-07 17:16         ` Andres Freund
2011-10-01 20:50   ` Andres Freund [this message]
2011-10-02  5:28   ` Improve lseek scalability v3 Andi Kleen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201110012250.04307.andres@anarazel.de \
    --to=andres@anarazel.de \
    --cc=andi@firstfloor.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robertmhaas@gmail.com \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.