Commit dfb388bf authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

[PATCH] factor out common code in sys_fsync/sys_fdatasync

This patch consolidates sys_fsync and sys_fdatasync.
Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 01890a4c
......@@ -331,7 +331,7 @@ int file_fsync(struct file *filp, struct dentry *dentry, int datasync)
return ret;
}
asmlinkage long sys_fsync(unsigned int fd)
static long do_fsync(unsigned int fd, int datasync)
{
struct file * file;
struct address_space *mapping;
......@@ -342,14 +342,14 @@ asmlinkage long sys_fsync(unsigned int fd)
if (!file)
goto out;
mapping = file->f_mapping;
ret = -EINVAL;
if (!file->f_op || !file->f_op->fsync) {
/* Why? We can still call filemap_fdatawrite */
goto out_putf;
}
mapping = file->f_mapping;
current->flags |= PF_SYNCWRITE;
ret = filemap_fdatawrite(mapping);
......@@ -358,7 +358,7 @@ asmlinkage long sys_fsync(unsigned int fd)
* which could cause livelocks in fsync_buffers_list
*/
down(&mapping->host->i_sem);
err = file->f_op->fsync(file, file->f_dentry, 0);
err = file->f_op->fsync(file, file->f_dentry, datasync);
if (!ret)
ret = err;
up(&mapping->host->i_sem);
......@@ -373,39 +373,14 @@ out:
return ret;
}
asmlinkage long sys_fdatasync(unsigned int fd)
asmlinkage long sys_fsync(unsigned int fd)
{
struct file * file;
struct address_space *mapping;
int ret, err;
ret = -EBADF;
file = fget(fd);
if (!file)
goto out;
ret = -EINVAL;
if (!file->f_op || !file->f_op->fsync)
goto out_putf;
mapping = file->f_mapping;
current->flags |= PF_SYNCWRITE;
ret = filemap_fdatawrite(mapping);
down(&mapping->host->i_sem);
err = file->f_op->fsync(file, file->f_dentry, 1);
if (!ret)
ret = err;
up(&mapping->host->i_sem);
err = filemap_fdatawait(mapping);
if (!ret)
ret = err;
current->flags &= ~PF_SYNCWRITE;
return do_fsync(fd, 0);
}
out_putf:
fput(file);
out:
return ret;
asmlinkage long sys_fdatasync(unsigned int fd)
{
return do_fsync(fd, 1);
}
/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment