projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timecounter-next'
[cascardo/linux.git]
/
fs
/
open.c
diff --git
a/fs/open.c
b/fs/open.c
index
d45bd90
..
813be03
100644
(file)
--- a/
fs/open.c
+++ b/
fs/open.c
@@
-222,7
+222,7
@@
SYSCALL_DEFINE2(ftruncate64, unsigned int, fd, loff_t, length)
#endif /* BITS_PER_LONG == 32 */
#endif /* BITS_PER_LONG == 32 */
-int
do
_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
+int
vfs
_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
{
struct inode *inode = file_inode(file);
long ret;
{
struct inode *inode = file_inode(file);
long ret;
@@
-309,6
+309,7
@@
int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
sb_end_write(inode->i_sb);
return ret;
}
sb_end_write(inode->i_sb);
return ret;
}
+EXPORT_SYMBOL_GPL(vfs_fallocate);
SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)
{
SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)
{
@@
-316,7
+317,7
@@
SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)
int error = -EBADF;
if (f.file) {
int error = -EBADF;
if (f.file) {
- error =
do
_fallocate(f.file, mode, offset, len);
+ error =
vfs
_fallocate(f.file, mode, offset, len);
fdput(f);
}
return error;
fdput(f);
}
return error;