aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-08-18 10:16:05 -0400
committerChris Mason <chris.mason@oracle.com>2011-08-18 10:16:05 -0400
commit9a4327ca1f45f82edad7dc0a4e52ce9316e0950c (patch)
tree322aa21ccdd9a9aaeac28ccdb08ae1e1b5baeb12
parentcb6db4e57632ba8589cc2f9fe1d0aa9116b87ab8 (diff)
downloadkernel_goldelico_gta04-9a4327ca1f45f82edad7dc0a4e52ce9316e0950c.zip
kernel_goldelico_gta04-9a4327ca1f45f82edad7dc0a4e52ce9316e0950c.tar.gz
kernel_goldelico_gta04-9a4327ca1f45f82edad7dc0a4e52ce9316e0950c.tar.bz2
btrfs: unlock on error in btrfs_file_llseek()
There were some unlocks on error missing in a recent patch to btrfs_file_llseek(). Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/btrfs/file.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 658d669..f7d9df7 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1804,10 +1804,14 @@ static loff_t btrfs_file_llseek(struct file *file, loff_t offset, int origin)
}
}
- if (offset < 0 && !(file->f_mode & FMODE_UNSIGNED_OFFSET))
- return -EINVAL;
- if (offset > inode->i_sb->s_maxbytes)
- return -EINVAL;
+ if (offset < 0 && !(file->f_mode & FMODE_UNSIGNED_OFFSET)) {
+ ret = -EINVAL;
+ goto out;
+ }
+ if (offset > inode->i_sb->s_maxbytes) {
+ ret = -EINVAL;
+ goto out;
+ }
/* Special lock needed here? */
if (offset != file->f_pos) {