From 8a7242f24fcb7c2862136df4cd9c6011da81d36b Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Thu, 18 Aug 2011 10:16:05 -0400
Subject: [PATCH] --- yaml --- r: 263091 b: refs/heads/master c:
 9a4327ca1f45f82edad7dc0a4e52ce9316e0950c h: refs/heads/master i:   263089:
 df35456534505dbf30f3104b07ccd5973a157712   263087:
 c23d13ceaf8dd726d484261adcbbcbd8651dff7b v: v3

---
 [refs]                |  2 +-
 trunk/fs/btrfs/file.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 31c19a7dab95..4c00d4f38722 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb6db4e57632ba8589cc2f9fe1d0aa9116b87ab8
+refs/heads/master: 9a4327ca1f45f82edad7dc0a4e52ce9316e0950c
diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c
index 658d66959abe..f7d9df7f3fdd 100644
--- a/trunk/fs/btrfs/file.c
+++ b/trunk/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) {