diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 19:08:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 19:08:10 +0200 |
| commit | b80e0d271606a0f5b35c85b11f9014ce09cbc415 (patch) | |
| tree | e030cdeeb857456382bd0962a584b48b7a76566e /fs | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| parent | fuse: fix fuse_file_lseek returning with lock held (diff) | |
| download | linux-b80e0d271606a0f5b35c85b11f9014ce09cbc415.tar.xz linux-b80e0d271606a0f5b35c85b11f9014ce09cbc415.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: fix fuse_file_lseek returning with lock held
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fuse/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index d9fdb7cec538..821d10f719bd 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; } |