2006-03-31 14:30:42 +04:00
/*
* High - level sync ( ) - related operations
*/
# include <linux/kernel.h>
# include <linux/file.h>
# include <linux/fs.h>
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 11:04:11 +03:00
# include <linux/slab.h>
2011-11-17 08:57:37 +04:00
# include <linux/export.h>
2011-03-10 22:31:30 +03:00
# include <linux/namei.h>
2006-10-18 21:55:46 +04:00
# include <linux/sched.h>
2006-03-31 14:30:42 +04:00
# include <linux/writeback.h>
# include <linux/syscalls.h>
# include <linux/linkage.h>
# include <linux/pagemap.h>
2006-08-29 22:05:54 +04:00
# include <linux/quotaops.h>
2010-04-25 10:54:42 +04:00
# include <linux/backing-dev.h>
2009-04-27 18:43:48 +04:00
# include "internal.h"
2006-03-31 14:30:42 +04:00
# define VALID_FLAGS (SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE| \
SYNC_FILE_RANGE_WAIT_AFTER )
2009-04-27 18:43:52 +04:00
/*
2009-09-02 14:34:32 +04:00
* Do the filesystem syncing work . For simple filesystems
* writeback_inodes_sb ( sb ) just dirties buffers with inodes so we have to
* submit IO for these buffers via __sync_blockdev ( ) . This also speeds up the
* wait = = 1 case since in that case write_inode ( ) functions do
* sync_dirty_buffer ( ) and thus effectively write one block at a time .
2009-04-27 18:43:52 +04:00
*/
2009-04-27 18:43:53 +04:00
static int __sync_filesystem ( struct super_block * sb , int wait )
2009-04-27 18:43:52 +04:00
{
2010-02-16 11:44:52 +03:00
if ( wait )
2009-09-02 14:34:32 +04:00
sync_inodes_sb ( sb ) ;
2010-02-16 11:44:52 +03:00
else
2011-10-08 07:54:10 +04:00
writeback_inodes_sb ( sb , WB_REASON_SYNC ) ;
2010-02-16 11:44:52 +03:00
2009-04-27 18:43:52 +04:00
if ( sb - > s_op - > sync_fs )
sb - > s_op - > sync_fs ( sb , wait ) ;
return __sync_blockdev ( sb - > s_bdev , wait ) ;
}
/*
* Write out and wait upon all dirty data associated with this
* superblock . Filesystem data as well as the underlying block
* device . Takes the superblock lock .
*/
2009-04-27 18:43:53 +04:00
int sync_filesystem ( struct super_block * sb )
2009-04-27 18:43:52 +04:00
{
int ret ;
2009-05-05 17:41:25 +04:00
/*
* We need to be protected against the filesystem going from
* r / o to r / w or vice versa .
*/
WARN_ON ( ! rwsem_is_locked ( & sb - > s_umount ) ) ;
/*
* No point in syncing out anything if the filesystem is read - only .
*/
if ( sb - > s_flags & MS_RDONLY )
return 0 ;
2009-04-27 18:43:53 +04:00
ret = __sync_filesystem ( sb , 0 ) ;
2009-04-27 18:43:52 +04:00
if ( ret < 0 )
return ret ;
2009-04-27 18:43:53 +04:00
return __sync_filesystem ( sb , 1 ) ;
2009-04-27 18:43:52 +04:00
}
2009-04-27 18:43:53 +04:00
EXPORT_SYMBOL_GPL ( sync_filesystem ) ;
2009-04-27 18:43:52 +04:00
2012-07-03 18:45:30 +04:00
static void sync_inodes_one_sb ( struct super_block * sb , void * arg )
2010-03-23 13:06:58 +03:00
{
2011-03-17 13:13:12 +03:00
if ( ! ( sb - > s_flags & MS_RDONLY ) )
2012-07-03 18:45:30 +04:00
sync_inodes_sb ( sb ) ;
2010-03-23 13:06:58 +03:00
}
2012-07-03 18:45:30 +04:00
static void writeback_inodes_one_sb ( struct super_block * sb , void * arg )
2009-04-27 18:43:52 +04:00
{
2012-07-03 18:45:30 +04:00
if ( ! ( sb - > s_flags & MS_RDONLY ) )
writeback_inodes_sb ( sb , WB_REASON_SYNC ) ;
}
static void sync_fs_one_sb ( struct super_block * sb , void * arg )
{
if ( ! ( sb - > s_flags & MS_RDONLY ) & & sb - > s_op - > sync_fs )
sb - > s_op - > sync_fs ( sb , * ( int * ) arg ) ;
}
2012-07-03 18:45:32 +04:00
static void flush_one_bdev ( struct block_device * bdev , void * arg )
2012-07-03 18:45:30 +04:00
{
2012-07-03 18:45:32 +04:00
__sync_blockdev ( bdev , 0 ) ;
}
static void sync_one_bdev ( struct block_device * bdev , void * arg )
{
sync_blockdev ( bdev ) ;
2009-04-27 18:43:52 +04:00
}
2009-07-05 23:08:08 +04:00
/*
* sync everything . Start out by waking pdflush , because that writes back
* all queues in parallel .
*/
2009-04-27 18:43:51 +04:00
SYSCALL_DEFINE0 ( sync )
2006-08-29 22:05:54 +04:00
{
2012-07-03 18:45:30 +04:00
int nowait = 0 , wait = 1 ;
2011-10-08 07:54:10 +04:00
wakeup_flusher_threads ( 0 , WB_REASON_SYNC ) ;
2012-07-03 18:45:30 +04:00
iterate_supers ( writeback_inodes_one_sb , NULL ) ;
iterate_supers ( sync_fs_one_sb , & nowait ) ;
2012-07-03 18:45:32 +04:00
iterate_bdevs ( flush_one_bdev , NULL ) ;
2012-07-03 18:45:30 +04:00
iterate_supers ( sync_inodes_one_sb , NULL ) ;
iterate_supers ( sync_fs_one_sb , & wait ) ;
2012-07-03 18:45:32 +04:00
iterate_bdevs ( sync_one_bdev , NULL ) ;
2006-08-29 22:05:54 +04:00
if ( unlikely ( laptop_mode ) )
laptop_sync_completion ( ) ;
return 0 ;
}
2009-03-17 11:38:40 +03:00
static void do_sync_work ( struct work_struct * work )
{
2012-07-03 18:45:30 +04:00
int nowait = 0 ;
2009-04-27 18:43:51 +04:00
/*
* Sync twice to reduce the possibility we skipped some inodes / pages
* because they were temporarily locked
*/
2012-07-03 18:45:30 +04:00
iterate_supers ( sync_inodes_one_sb , & nowait ) ;
iterate_supers ( sync_fs_one_sb , & nowait ) ;
2012-07-03 18:45:32 +04:00
iterate_bdevs ( flush_one_bdev , NULL ) ;
2012-07-03 18:45:30 +04:00
iterate_supers ( sync_inodes_one_sb , & nowait ) ;
iterate_supers ( sync_fs_one_sb , & nowait ) ;
2012-07-03 18:45:32 +04:00
iterate_bdevs ( flush_one_bdev , NULL ) ;
2009-04-27 18:43:51 +04:00
printk ( " Emergency Sync complete \n " ) ;
2009-03-17 11:38:40 +03:00
kfree ( work ) ;
}
2006-08-29 22:05:54 +04:00
void emergency_sync ( void )
{
2009-03-17 11:38:40 +03:00
struct work_struct * work ;
work = kmalloc ( sizeof ( * work ) , GFP_ATOMIC ) ;
if ( work ) {
INIT_WORK ( work , do_sync_work ) ;
schedule_work ( work ) ;
}
2006-08-29 22:05:54 +04:00
}
2011-03-10 22:31:30 +03:00
/*
* sync a single super
*/
SYSCALL_DEFINE1 ( syncfs , int , fd )
{
struct file * file ;
struct super_block * sb ;
int ret ;
int fput_needed ;
file = fget_light ( fd , & fput_needed ) ;
if ( ! file )
return - EBADF ;
sb = file - > f_dentry - > d_sb ;
down_read ( & sb - > s_umount ) ;
ret = sync_filesystem ( sb ) ;
up_read ( & sb - > s_umount ) ;
fput_light ( file , fput_needed ) ;
return ret ;
}
2008-12-22 23:11:15 +03:00
/**
2009-08-17 21:52:36 +04:00
* vfs_fsync_range - helper to sync a range of data & metadata to disk
2008-12-22 23:11:15 +03:00
* @ file : file to sync
2009-08-17 21:52:36 +04:00
* @ start : offset in bytes of the beginning of data range to sync
* @ end : offset in bytes of the end of data range ( inclusive )
* @ datasync : perform only datasync
2008-12-22 23:11:15 +03:00
*
2009-08-17 21:52:36 +04:00
* Write back data in range @ start . . @ end and metadata for @ file to disk . If
* @ datasync is set only metadata needed to access modified file data is
* written .
2008-12-22 23:11:15 +03:00
*/
2010-03-22 19:32:25 +03:00
int vfs_fsync_range ( struct file * file , loff_t start , loff_t end , int datasync )
2006-08-29 22:05:54 +04:00
{
2011-07-17 04:44:56 +04:00
if ( ! file - > f_op | | ! file - > f_op - > fsync )
return - EINVAL ;
return file - > f_op - > fsync ( file , start , end , datasync ) ;
2006-08-29 22:05:54 +04:00
}
2009-08-17 21:52:36 +04:00
EXPORT_SYMBOL ( vfs_fsync_range ) ;
/**
* vfs_fsync - perform a fsync or fdatasync on a file
* @ file : file to sync
* @ datasync : only perform a fdatasync operation
*
* Write back data and metadata for @ file to disk . If @ datasync is
* set only metadata needed to access modified file data is written .
*/
2010-03-22 19:32:25 +03:00
int vfs_fsync ( struct file * file , int datasync )
2009-08-17 21:52:36 +04:00
{
2010-03-22 19:32:25 +03:00
return vfs_fsync_range ( file , 0 , LLONG_MAX , datasync ) ;
2009-08-17 21:52:36 +04:00
}
2008-12-22 23:11:15 +03:00
EXPORT_SYMBOL ( vfs_fsync ) ;
2006-08-29 22:05:54 +04:00
2008-12-22 23:11:15 +03:00
static int do_fsync ( unsigned int fd , int datasync )
2006-08-29 22:05:54 +04:00
{
struct file * file ;
int ret = - EBADF ;
2012-04-20 07:52:50 +04:00
int fput_needed ;
2006-08-29 22:05:54 +04:00
2012-04-20 07:52:50 +04:00
file = fget_light ( fd , & fput_needed ) ;
2006-08-29 22:05:54 +04:00
if ( file ) {
2010-03-22 19:32:25 +03:00
ret = vfs_fsync ( file , datasync ) ;
2012-04-20 07:52:50 +04:00
fput_light ( file , fput_needed ) ;
2006-08-29 22:05:54 +04:00
}
return ret ;
}
2009-01-14 16:14:11 +03:00
SYSCALL_DEFINE1 ( fsync , unsigned int , fd )
2006-08-29 22:05:54 +04:00
{
2008-12-22 23:11:15 +03:00
return do_fsync ( fd , 0 ) ;
2006-08-29 22:05:54 +04:00
}
2009-01-14 16:14:11 +03:00
SYSCALL_DEFINE1 ( fdatasync , unsigned int , fd )
2006-08-29 22:05:54 +04:00
{
2008-12-22 23:11:15 +03:00
return do_fsync ( fd , 1 ) ;
2006-08-29 22:05:54 +04:00
}
2009-08-17 21:52:36 +04:00
/**
* generic_write_sync - perform syncing after a write if file / inode is sync
* @ file : file to which the write happened
* @ pos : offset where the write started
* @ count : length of the write
*
* This is just a simple wrapper about our general syncing function .
*/
int generic_write_sync ( struct file * file , loff_t pos , loff_t count )
{
2009-10-27 13:05:28 +03:00
if ( ! ( file - > f_flags & O_DSYNC ) & & ! IS_SYNC ( file - > f_mapping - > host ) )
2009-08-17 21:52:36 +04:00
return 0 ;
2010-03-22 19:32:25 +03:00
return vfs_fsync_range ( file , pos , pos + count - 1 ,
2009-10-27 13:05:28 +03:00
( file - > f_flags & __O_SYNC ) ? 0 : 1 ) ;
2009-08-17 21:52:36 +04:00
}
EXPORT_SYMBOL ( generic_write_sync ) ;
2006-03-31 14:30:42 +04:00
/*
* sys_sync_file_range ( ) permits finely controlled syncing over a segment of
* a file in the range offset . . ( offset + nbytes - 1 ) inclusive . If nbytes is
* zero then sys_sync_file_range ( ) will operate from offset out to EOF .
*
* The flag bits are :
*
* SYNC_FILE_RANGE_WAIT_BEFORE : wait upon writeout of all pages in the range
* before performing the write .
*
* SYNC_FILE_RANGE_WRITE : initiate writeout of all those dirty pages in the
2008-07-24 08:27:36 +04:00
* range which are not presently under writeback . Note that this may block for
* significant periods due to exhaustion of disk request structures .
2006-03-31 14:30:42 +04:00
*
* SYNC_FILE_RANGE_WAIT_AFTER : wait upon writeout of all pages in the range
* after performing the write .
*
* Useful combinations of the flag bits are :
*
* SYNC_FILE_RANGE_WAIT_BEFORE | SYNC_FILE_RANGE_WRITE : ensures that all pages
* in the range which were dirty on entry to sys_sync_file_range ( ) are placed
* under writeout . This is a start - write - for - data - integrity operation .
*
* SYNC_FILE_RANGE_WRITE : start writeout of all dirty pages in the range which
* are not presently under writeout . This is an asynchronous flush - to - disk
* operation . Not suitable for data integrity operations .
*
* SYNC_FILE_RANGE_WAIT_BEFORE ( or SYNC_FILE_RANGE_WAIT_AFTER ) : wait for
* completion of writeout of all pages in the range . This will be used after an
* earlier SYNC_FILE_RANGE_WAIT_BEFORE | SYNC_FILE_RANGE_WRITE operation to wait
* for that operation to complete and to return the result .
*
* SYNC_FILE_RANGE_WAIT_BEFORE | SYNC_FILE_RANGE_WRITE | SYNC_FILE_RANGE_WAIT_AFTER :
* a traditional sync ( ) operation . This is a write - for - data - integrity operation
* which will ensure that all pages in the range which were dirty on entry to
* sys_sync_file_range ( ) are committed to disk .
*
*
* SYNC_FILE_RANGE_WAIT_BEFORE and SYNC_FILE_RANGE_WAIT_AFTER will detect any
* I / O errors or ENOSPC conditions and will return those to the caller , after
* clearing the EIO and ENOSPC flags in the address_space .
*
* It should be noted that none of these operations write out the file ' s
* metadata . So unless the application is strictly performing overwrites of
* already - instantiated disk blocks , there are no guarantees here that the data
* will be available after a crash .
*/
2009-01-14 16:14:02 +03:00
SYSCALL_DEFINE ( sync_file_range ) ( int fd , loff_t offset , loff_t nbytes ,
unsigned int flags )
2006-03-31 14:30:42 +04:00
{
int ret ;
struct file * file ;
2009-12-17 16:24:40 +03:00
struct address_space * mapping ;
2006-03-31 14:30:42 +04:00
loff_t endbyte ; /* inclusive */
int fput_needed ;
umode_t i_mode ;
ret = - EINVAL ;
if ( flags & ~ VALID_FLAGS )
goto out ;
endbyte = offset + nbytes ;
if ( ( s64 ) offset < 0 )
goto out ;
if ( ( s64 ) endbyte < 0 )
goto out ;
if ( endbyte < offset )
goto out ;
if ( sizeof ( pgoff_t ) = = 4 ) {
if ( offset > = ( 0x100000000ULL < < PAGE_CACHE_SHIFT ) ) {
/*
* The range starts outside a 32 bit machine ' s
* pagecache addressing capabilities . Let it " succeed "
*/
ret = 0 ;
goto out ;
}
if ( endbyte > = ( 0x100000000ULL < < PAGE_CACHE_SHIFT ) ) {
/*
* Out to EOF
*/
nbytes = 0 ;
}
}
if ( nbytes = = 0 )
[PATCH] writeback: fix range handling
When a writeback_control's `start' and `end' fields are used to
indicate a one-byte-range starting at file offset zero, the required
values of .start=0,.end=0 mean that the ->writepages() implementation
has no way of telling that it is being asked to perform a range
request. Because we're currently overloading (start == 0 && end == 0)
to mean "this is not a write-a-range request".
To make all this sane, the patch changes range of writeback_control.
So caller does: If it is calling ->writepages() to write pages, it
sets range (range_start/end or range_cyclic) always.
And if range_cyclic is true, ->writepages() thinks the range is
cyclic, otherwise it just uses range_start and range_end.
This patch does,
- Add LLONG_MAX, LLONG_MIN, ULLONG_MAX to include/linux/kernel.h
-1 is usually ok for range_end (type is long long). But, if someone did,
range_end += val; range_end is "val - 1"
u64val = range_end >> bits; u64val is "~(0ULL)"
or something, they are wrong. So, this adds LLONG_MAX to avoid nasty
things, and uses LLONG_MAX for range_end.
- All callers of ->writepages() sets range_start/end or range_cyclic.
- Fix updates of ->writeback_index. It seems already bit strange.
If it starts at 0 and ended by check of nr_to_write, this last
index may reduce chance to scan end of file. So, this updates
->writeback_index only if range_cyclic is true or whole-file is
scanned.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Anton Altaparmakov <aia21@cantab.net>
Cc: Steven French <sfrench@us.ibm.com>
Cc: "Vladimir V. Saveliev" <vs@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 13:03:26 +04:00
endbyte = LLONG_MAX ;
2006-03-31 14:30:42 +04:00
else
endbyte - - ; /* inclusive */
ret = - EBADF ;
file = fget_light ( fd , & fput_needed ) ;
if ( ! file )
goto out ;
2006-12-08 13:36:35 +03:00
i_mode = file - > f_path . dentry - > d_inode - > i_mode ;
2006-03-31 14:30:42 +04:00
ret = - ESPIPE ;
if ( ! S_ISREG ( i_mode ) & & ! S_ISBLK ( i_mode ) & & ! S_ISDIR ( i_mode ) & &
! S_ISLNK ( i_mode ) )
goto out_put ;
2009-12-17 16:24:40 +03:00
mapping = file - > f_mapping ;
if ( ! mapping ) {
ret = - EINVAL ;
goto out_put ;
}
ret = 0 ;
if ( flags & SYNC_FILE_RANGE_WAIT_BEFORE ) {
ret = filemap_fdatawait_range ( mapping , offset , endbyte ) ;
if ( ret < 0 )
goto out_put ;
}
if ( flags & SYNC_FILE_RANGE_WRITE ) {
ret = filemap_fdatawrite_range ( mapping , offset , endbyte ) ;
if ( ret < 0 )
goto out_put ;
}
if ( flags & SYNC_FILE_RANGE_WAIT_AFTER )
ret = filemap_fdatawait_range ( mapping , offset , endbyte ) ;
2006-03-31 14:30:42 +04:00
out_put :
fput_light ( file , fput_needed ) ;
out :
return ret ;
}
2009-01-14 16:14:02 +03:00
# ifdef CONFIG_HAVE_SYSCALL_WRAPPERS
asmlinkage long SyS_sync_file_range ( long fd , loff_t offset , loff_t nbytes ,
long flags )
{
return SYSC_sync_file_range ( ( int ) fd , offset , nbytes ,
( unsigned int ) flags ) ;
}
SYSCALL_ALIAS ( sys_sync_file_range , SyS_sync_file_range ) ;
# endif
2006-03-31 14:30:42 +04:00
Introduce fixed sys_sync_file_range2() syscall, implement on PowerPC and ARM
Not all the world is an i386. Many architectures need 64-bit arguments to be
aligned in suitable pairs of registers, and the original
sys_sync_file_range(int, loff_t, loff_t, int) was therefore wasting an
argument register for padding after the first integer. Since we don't
normally have more than 6 arguments for system calls, that left no room for
the final argument on some architectures.
Fix this by introducing sys_sync_file_range2(int, int, loff_t, loff_t) which
all fits nicely. In fact, ARM already had that, but called it
sys_arm_sync_file_range. Move it to fs/sync.c and rename it, then implement
the needed compatibility routine. And stop the missing syscall check from
bitching about the absence of sys_sync_file_range() if we've implemented
sys_sync_file_range2() instead.
Tested on PPC32 and with 32-bit and 64-bit userspace on PPC64.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-06-28 01:10:09 +04:00
/* It would be nice if people remember that not all the world's an i386
when they introduce new system calls */
2009-01-14 16:14:02 +03:00
SYSCALL_DEFINE ( sync_file_range2 ) ( int fd , unsigned int flags ,
loff_t offset , loff_t nbytes )
Introduce fixed sys_sync_file_range2() syscall, implement on PowerPC and ARM
Not all the world is an i386. Many architectures need 64-bit arguments to be
aligned in suitable pairs of registers, and the original
sys_sync_file_range(int, loff_t, loff_t, int) was therefore wasting an
argument register for padding after the first integer. Since we don't
normally have more than 6 arguments for system calls, that left no room for
the final argument on some architectures.
Fix this by introducing sys_sync_file_range2(int, int, loff_t, loff_t) which
all fits nicely. In fact, ARM already had that, but called it
sys_arm_sync_file_range. Move it to fs/sync.c and rename it, then implement
the needed compatibility routine. And stop the missing syscall check from
bitching about the absence of sys_sync_file_range() if we've implemented
sys_sync_file_range2() instead.
Tested on PPC32 and with 32-bit and 64-bit userspace on PPC64.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-06-28 01:10:09 +04:00
{
return sys_sync_file_range ( fd , offset , nbytes , flags ) ;
}
2009-01-14 16:14:02 +03:00
# ifdef CONFIG_HAVE_SYSCALL_WRAPPERS
asmlinkage long SyS_sync_file_range2 ( long fd , long flags ,
loff_t offset , loff_t nbytes )
{
return SYSC_sync_file_range2 ( ( int ) fd , ( unsigned int ) flags ,
offset , nbytes ) ;
}
SYSCALL_ALIAS ( sys_sync_file_range2 , SyS_sync_file_range2 ) ;
# endif