git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
fs
/
xfs
/
linux-2.6
/
xfs_ioctl32.c
diff --git
a/fs/xfs/linux-2.6/xfs_ioctl32.c
b/fs/xfs/linux-2.6/xfs_ioctl32.c
index
b3486df
..
54e623b
100644
(file)
--- a/
fs/xfs/linux-2.6/xfs_ioctl32.c
+++ b/
fs/xfs/linux-2.6/xfs_ioctl32.c
@@
-586,7
+586,8
@@
xfs_file_compat_ioctl(
case XFS_IOC_RESVSP_32:
case XFS_IOC_UNRESVSP_32:
case XFS_IOC_RESVSP64_32:
- case XFS_IOC_UNRESVSP64_32: {
+ case XFS_IOC_UNRESVSP64_32:
+ case XFS_IOC_ZERO_RANGE_32: {
struct xfs_flock64 bf;
if (xfs_compat_flock64_copyin(&bf, arg))