Skip to content

Commit

Permalink
Fix sync_file_range on ppc/ppc64.
Browse files Browse the repository at this point in the history
I've noticed that sync_file_range is a stub on ppc/ppc64.
The kernel on these arches provides sync_file_range2 syscall with swapped
parameters.
The following completely untested patch ought to fix this.
(cherry picked from commit 8ad81b3)
  • Loading branch information
Jakub Jelinek authored and Petr Baudis committed Nov 19, 2009
1 parent 16b583e commit 1bc1954
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 1 deletion.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2009-11-16 Jakub Jelinek <jakub@redhat.com>

* sysdeps/unix/sysv/linux/sync_file_range.c (sync_file_range):
Implement using sync_file_range2 syscall if __NR_sync_file_range2
is defined.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c: New
file.

2009-11-19 Ulrich Drepper <drepper@redhat.com>

[BZ #10958]
Expand Down
44 changes: 44 additions & 0 deletions sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/* Selective file content synch'ing.
Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */

#include <errno.h>
#include <fcntl.h>
#include <sys/types.h>

#include <sysdep.h>
#include <sys/syscall.h>


#if defined __NR_sync_file_range2
int
sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
{
return INLINE_SYSCALL (sync_file_range2, 4, fd, flags, from, to);
}
#else
int
sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
{
__set_errno (ENOSYS);
return -1;
}
stub_warning (sync_file_range)

# include <stub-tag.h>
#endif
10 changes: 9 additions & 1 deletion sysdeps/unix/sysv/linux/sync_file_range.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Selective file content synch'ing.
Copyright (C) 2006, 2007 Free Software Foundation, Inc.
Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -34,6 +34,14 @@ sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
__LONG_LONG_PAIR ((long) (to >> 32), (long) to),
flags);
}
#elif defined __NR_sync_file_range2
int
sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
{
return INLINE_SYSCALL (sync_file_range2, 6, fd, flags,
__LONG_LONG_PAIR ((long) (from >> 32), (long) from),
__LONG_LONG_PAIR ((long) (to >> 32), (long) to));
}
#else
int
sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
Expand Down

0 comments on commit 1bc1954

Please sign in to comment.