From: Andi Kleen <andi@firstfloor.org>
To: viro@zeniv.linux.org.uk
Cc: hch@infradead.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 7/7] LSEEK: BTRFS: Avoid i_mutex for SEEK_{CUR,SET,END}
Date: Mon, 22 Aug 2011 13:49:12 -0700 [thread overview]
Message-ID: <1314046152-2175-8-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1314046152-2175-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Don't need the i_mutex for those cases, only for SEEK_HOLE/DATA.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
fs/btrfs/file.c | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 6107b94..35f5f13 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1805,18 +1805,13 @@ static loff_t btrfs_file_llseek(struct file *file, loff_t offset, int origin)
struct inode *inode = file->f_mapping->host;
int ret;
+ if (origin != SEEK_DATA && origin != SEEK_HOLE)
+ return generic_file_llseek(file, offset, origin);
+
mutex_lock(&inode->i_mutex);
- switch (origin) {
- case SEEK_END:
- case SEEK_CUR:
- offset = generic_file_llseek(file, offset, origin);
- goto out;
- case SEEK_DATA:
- case SEEK_HOLE:
- ret = find_desired_extent(inode, &offset, origin);
- if (ret)
- goto error;
- }
+ ret = find_desired_extent(inode, &offset, origin);
+ if (ret)
+ goto error;
if (offset < 0 && !(file->f_mode & FMODE_UNSIGNED_OFFSET)) {
ret = -EINVAL;
@@ -1832,7 +1827,6 @@ static loff_t btrfs_file_llseek(struct file *file, loff_t offset, int origin)
file->f_pos = offset;
file->f_version = 0;
}
-out:
mutex_unlock(&inode->i_mutex);
return offset;
error:
--
1.7.4.4
next prev parent reply other threads:[~2011-08-22 20:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-22 20:49 Improve lseek scalability Andi Kleen
2011-08-22 20:49 ` [PATCH 1/7] BTRFS: Fix lseek return value for error Andi Kleen
2011-08-22 20:49 ` [PATCH 2/7] VFS: Do (nearly) lockless generic_file_llseek Andi Kleen
2011-08-22 20:49 ` [PATCH 3/7] VFS: Make generic lseek lockless safe Andi Kleen
2011-08-22 20:49 ` [PATCH 4/7] VFS: Add generic_file_llseek_size Andi Kleen
2011-08-23 0:08 ` Andreas Dilger
2011-08-23 0:10 ` Andi Kleen
2011-08-23 12:51 ` Arnd Bergmann
2011-08-23 16:07 ` Andi Kleen
2011-08-22 20:49 ` [PATCH 5/7] LSEEK: EXT4: Replace cut'n'pasted llseek code with generic_file_llseek_size Andi Kleen
2011-08-22 20:49 ` [PATCH 6/7] LSEEK: NFS: Drop unnecessary locking in llseek Andi Kleen
2011-08-22 20:49 ` Andi Kleen [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-15 23:06 Improve lseek scalability v3 Andi Kleen
2011-09-15 23:06 ` [PATCH 7/7] LSEEK: BTRFS: Avoid i_mutex for SEEK_{CUR,SET,END} 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=1314046152-2175-8-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).