mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
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
This commit is contained in:
commit
b80e0d2716
1 changed files with 2 additions and 1 deletions
|
@ -1465,7 +1465,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
|
||||||
case SEEK_END:
|
case SEEK_END:
|
||||||
retval = fuse_update_attributes(inode, NULL, file, NULL);
|
retval = fuse_update_attributes(inode, NULL, file, NULL);
|
||||||
if (retval)
|
if (retval)
|
||||||
return retval;
|
goto exit;
|
||||||
offset += i_size_read(inode);
|
offset += i_size_read(inode);
|
||||||
break;
|
break;
|
||||||
case SEEK_CUR:
|
case SEEK_CUR:
|
||||||
|
@ -1479,6 +1479,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
|
||||||
}
|
}
|
||||||
retval = offset;
|
retval = offset;
|
||||||
}
|
}
|
||||||
|
exit:
|
||||||
mutex_unlock(&inode->i_mutex);
|
mutex_unlock(&inode->i_mutex);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue