lkml.org 
[lkml]   [2011]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [patch] fs: add missing unlock in default_llseek()
On 07/26/2011 10:25 AM, Dan Carpenter wrote:
>
> 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>
>
> diff --git a/fs/read_write.c b/fs/read_write.c
> index 5907b49..179f1c3 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;
> }

Eeek copy+paste bites me again. Thanks

Acked-by: Josef Bacik <josef@redhat.com>


\
 
 \ /
  Last update: 2011-07-26 16:33    [W:0.044 / U:0.544 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site