projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MIPS] Separate performance counter interrupts
[powerpc.git]
/
fs
/
sync.c
diff --git
a/fs/sync.c
b/fs/sync.c
index
1de747b
..
2f97576
100644
(file)
--- a/
fs/sync.c
+++ b/
fs/sync.c
@@
-6,6
+6,7
@@
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/module.h>
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/module.h>
+#include <linux/sched.h>
#include <linux/writeback.h>
#include <linux/syscalls.h>
#include <linux/linkage.h>
#include <linux/writeback.h>
#include <linux/syscalls.h>
#include <linux/linkage.h>
@@
-93,7
+94,7
@@
long do_fsync(struct file *file, int datasync)
* livelocks in fsync_buffers_list().
*/
mutex_lock(&mapping->host->i_mutex);
* livelocks in fsync_buffers_list().
*/
mutex_lock(&mapping->host->i_mutex);
- err = file->f_op->fsync(file, file->f_dentry, datasync);
+ err = file->f_op->fsync(file, file->f_
path.
dentry, datasync);
if (!ret)
ret = err;
mutex_unlock(&mapping->host->i_mutex);
if (!ret)
ret = err;
mutex_unlock(&mapping->host->i_mutex);
@@
-222,13
+223,13
@@
asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes,
if (!file)
goto out;
if (!file)
goto out;
- i_mode = file->f_dentry->d_inode->i_mode;
+ i_mode = file->f_
path.
dentry->d_inode->i_mode;
ret = -ESPIPE;
if (!S_ISREG(i_mode) && !S_ISBLK(i_mode) && !S_ISDIR(i_mode) &&
!S_ISLNK(i_mode))
goto out_put;
ret = -ESPIPE;
if (!S_ISREG(i_mode) && !S_ISBLK(i_mode) && !S_ISDIR(i_mode) &&
!S_ISLNK(i_mode))
goto out_put;
- ret = do_sync_
file_range(file
, offset, endbyte, flags);
+ ret = do_sync_
mapping_range(file->f_mapping
, offset, endbyte, flags);
out_put:
fput_light(file, fput_needed);
out:
out_put:
fput_light(file, fput_needed);
out:
@@
-238,13
+239,11
@@
out:
/*
* `endbyte' is inclusive
*/
/*
* `endbyte' is inclusive
*/
-int do_sync_
file_range(struct file *file, loff_t offset, loff_t endbyte
,
- unsigned int flags)
+int do_sync_
mapping_range(struct address_space *mapping, loff_t offset
,
+
loff_t endbyte,
unsigned int flags)
{
int ret;
{
int ret;
- struct address_space *mapping;
- mapping = file->f_mapping;
if (!mapping) {
ret = -EINVAL;
goto out;
if (!mapping) {
ret = -EINVAL;
goto out;
@@
-274,4
+273,4
@@
int do_sync_file_range(struct file *file, loff_t offset, loff_t endbyte,
out:
return ret;
}
out:
return ret;
}
-EXPORT_SYMBOL_GPL(do_sync_
file
_range);
+EXPORT_SYMBOL_GPL(do_sync_
mapping
_range);