Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] fsync: extract internal code

Browse source 
Pull the guts out of do_fsync() - we can use it elsewhere.

Cc: Hugh Dickins <hugh@veritas.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton 2006-03-24 03:18:14 -08:00 committed by Linus Torvalds
parent 676758bdb7
commit 18e79b40ed
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
fs/buffer.c
View file

@ -327,31 +327,24 @@ int file_fsync(struct file *filp, struct dentry *dentry, int datasync)
return ret; return ret;
} }
static long do_fsync(unsigned int fd, int datasync) long do_fsync(struct file *file, int datasync)
{ {
struct file * file; int ret;
struct address_space *mapping; int err;
int ret, err; struct address_space *mapping = file->f_mapping;
ret = -EBADF;
file = fget(fd);
if (!file)
goto out;
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; ret = -EINVAL;
goto out;
} }
mapping = file->f_mapping;
current->flags |= PF_SYNCWRITE; current->flags |= PF_SYNCWRITE;
ret = filemap_fdatawrite(mapping); ret = filemap_fdatawrite(mapping);
/* /*
* We need to protect against concurrent writers, * We need to protect against concurrent writers, which could cause
* which could cause livelocks in fsync_buffers_list * livelocks in fsync_buffers_list().
*/ */
mutex_lock(&mapping->host->i_mutex); mutex_lock(&mapping->host->i_mutex);
err = file->f_op->fsync(file, file->f_dentry, datasync); err = file->f_op->fsync(file, file->f_dentry, datasync);
@ -362,21 +355,31 @@ static long do_fsync(unsigned int fd, int datasync)
if (!ret) if (!ret)
ret = err; ret = err;
current->flags &= ~PF_SYNCWRITE; current->flags &= ~PF_SYNCWRITE;
out_putf:
fput(file);
out: out:
return ret; return ret;
} }
static long __do_fsync(unsigned int fd, int datasync)
{
struct file *file;
int ret = -EBADF;
file = fget(fd);
if (file) {
ret = do_fsync(file, datasync);
fput(file);
}
return ret;
}
asmlinkage long sys_fsync(unsigned int fd) asmlinkage long sys_fsync(unsigned int fd)
{ {
return do_fsync(fd, 0); return __do_fsync(fd, 0);
} }
asmlinkage long sys_fdatasync(unsigned int fd) asmlinkage long sys_fdatasync(unsigned int fd)
{ {
return do_fsync(fd, 1); return __do_fsync(fd, 1);
} }
/* /*

1
include/linux/fs.h
View file

@ -1478,6 +1478,7 @@ extern int wait_on_page_writeback_range(struct address_space *mapping,
extern int __filemap_fdatawrite_range(struct address_space *mapping, extern int __filemap_fdatawrite_range(struct address_space *mapping,
loff_t start, loff_t end, int sync_mode); loff_t start, loff_t end, int sync_mode);
extern long do_fsync(struct file *file, int datasync);
extern void sync_supers(void); extern void sync_supers(void);
extern void sync_filesystems(int wait); extern void sync_filesystems(int wait);
extern void emergency_sync(void); extern void emergency_sync(void);