Blaster4385/linux-IllusionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] factor out common code in sys_fsync/sys_fdatasync

Browse source 
This patch consolidates sys_fsync and sys_fdatasync.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Oleg Nesterov 2005-06-23 00:10:02 -07:00 committed by Linus Torvalds
parent 01890a4c12
commit dfb388bf8a
1 changed files with 10 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
fs/buffer.c
View file

@ -331,7 +331,7 @@ int file_fsync(struct file *filp, struct dentry *dentry, int datasync)
return ret; return ret;
} }
asmlinkage long sys_fsync(unsigned int fd) static long do_fsync(unsigned int fd, int datasync)
{ {
struct file * file; struct file * file;
struct address_space *mapping; struct address_space *mapping;
@ -342,14 +342,14 @@ asmlinkage long sys_fsync(unsigned int fd)
if (!file) if (!file)
goto out; goto out;
mapping = file->f_mapping;
ret = -EINVAL; ret = -EINVAL;
if (!file->f_op || !file->f_op->fsync) { if (!file->f_op || !file->f_op->fsync) {
/* Why? We can still call filemap_fdatawrite */ /* Why? We can still call filemap_fdatawrite */
goto out_putf; goto out_putf;
} }
mapping = file->f_mapping;
current->flags |= PF_SYNCWRITE; current->flags |= PF_SYNCWRITE;
ret = filemap_fdatawrite(mapping); ret = filemap_fdatawrite(mapping);
@ -358,7 +358,7 @@ asmlinkage long sys_fsync(unsigned int fd)
* which could cause livelocks in fsync_buffers_list * which could cause livelocks in fsync_buffers_list
*/ */
down(&mapping->host->i_sem); 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) if (!ret)
ret = err; ret = err;
up(&mapping->host->i_sem); up(&mapping->host->i_sem);
@ -373,39 +373,14 @@ out:
return ret; return ret;
} }
asmlinkage long sys_fsync(unsigned int fd)
{
return do_fsync(fd, 0);
}
asmlinkage long sys_fdatasync(unsigned int fd) asmlinkage long sys_fdatasync(unsigned int fd)
{ {
struct file * file; return do_fsync(fd, 1);
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;
out_putf:
fput(file);
out:
return ret;
} }
/* /*