From: Andi Kleen <a...@linux.intel.com>

Introduced with b26751575a9aa55fd6dbf3febde3ff06dfadc44f

Cc: jo...@redhat.com
Cc: chris.ma...@oracle.com
Signed-off-by: Andi Kleen <a...@linux.intel.com>
---
 fs/btrfs/file.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 658d669..8791613 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1798,16 +1798,15 @@ 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;
        }
 
+       ret = -EINVAL;
        if (offset < 0 && !(file->f_mode & FMODE_UNSIGNED_OFFSET))
-               return -EINVAL;
+               goto error;
        if (offset > inode->i_sb->s_maxbytes)
-               return -EINVAL;
+               goto error;
 
        /* Special lock needed here? */
        if (offset != file->f_pos) {
@@ -1817,6 +1816,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

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to