summaryrefslogtreecommitdiffstats
path: root/fs/read_write.c
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-07-26 17:25:20 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-26 12:57:09 -0400
commitbacb2d816c77edefd464d6bcc04c07f92109bd7d (patch)
tree2a82f79385efd920a1610666865e796c3c653551 /fs/read_write.c
parent750e06992d49666a7589aac555eb3bb68e4dbb88 (diff)
downloadlinux-stable-bacb2d816c77edefd464d6bcc04c07f92109bd7d.tar.gz
linux-stable-bacb2d816c77edefd464d6bcc04c07f92109bd7d.tar.bz2
linux-stable-bacb2d816c77edefd464d6bcc04c07f92109bd7d.zip
fs: add missing unlock in default_llseek()
A recent change in linux-next, 982d816581 "fs: add SEEK_HOLE and SEEK_DATA flags" added some direct returns on error, but it should have been a goto out. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/read_write.c')
-rw-r--r--fs/read_write.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/read_write.c b/fs/read_write.c
index 5907b49e4d7e..179f1c33ea57 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -166,8 +166,10 @@ loff_t default_llseek(struct file *file, loff_t offset, int origin)
* long as offset isn't at the end of the file then the
* offset is data.
*/
- if (offset >= inode->i_size)
- return -ENXIO;
+ if (offset >= inode->i_size) {
+ retval = -ENXIO;
+ goto out;
+ }
break;
case SEEK_HOLE:
/*
@@ -175,8 +177,10 @@ loff_t default_llseek(struct file *file, loff_t offset, int origin)
* as long as offset isn't i_size or larger, return
* i_size.
*/
- if (offset >= inode->i_size)
- return -ENXIO;
+ if (offset >= inode->i_size) {
+ retval = -ENXIO;
+ goto out;
+ }
offset = inode->i_size;
break;
}