summaryrefslogtreecommitdiff
path: root/fs/fuse
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2009-03-27 13:36:10 +0300
committerMiklos Szeredi <mszeredi@suse.cz>2009-03-30 17:26:24 +0200
commit5291658d87ac1ae60418e79e7b6bad7d5f595e0c (patch)
treee91cba2f5e73a5a93fcff6e866ebae737fee1e5c /fs/fuse
parent0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff)
downloadlinux-3.10-5291658d87ac1ae60418e79e7b6bad7d5f595e0c.tar.gz
linux-3.10-5291658d87ac1ae60418e79e7b6bad7d5f595e0c.tar.bz2
linux-3.10-5291658d87ac1ae60418e79e7b6bad7d5f595e0c.zip
fuse: fix fuse_file_lseek returning with lock held
This bug was found with smatch (http://repo.or.cz/w/smatch.git/). If we return directly the inode->i_mutex lock doesn't get released. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> CC: stable@kernel.org
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index d9fdb7cec53..821d10f719b 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1465,7 +1465,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
case SEEK_END:
retval = fuse_update_attributes(inode, NULL, file, NULL);
if (retval)
- return retval;
+ goto exit;
offset += i_size_read(inode);
break;
case SEEK_CUR:
@@ -1479,6 +1479,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
}
retval = offset;
}
+exit:
mutex_unlock(&inode->i_mutex);
return retval;
}