Commit 8b600a2e authored by Colin Ian King's avatar Colin Ian King Committed by Tim Gardner

UBUNTU: SAUCE: (noup) Update spl to 0.6.5.6-0ubuntu1, zfs to 0.6.5.6-0ubuntu3

Fixes two issues:
 * Add support 32 bit FS_IOC32_{GET|SET}FLAGS compat ioctls
   for (powerpc64 big endian mode)
 * Fix aarch64 compilation, missing hrtime_t and timestruc_t types

BugLink: http://bugs.launchpad.net/bugs/1564591Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent d62fbe67
...@@ -2,7 +2,7 @@ Meta: 1 ...@@ -2,7 +2,7 @@ Meta: 1
Name: zfs Name: zfs
Branch: 1.0 Branch: 1.0
Version: 0.6.5.6 Version: 0.6.5.6
Release: 0ubuntu1 Release: 0ubuntu3
Release-Tags: relext Release-Tags: relext
License: CDDL License: CDDL
Author: OpenZFS on Linux Author: OpenZFS on Linux
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
*/ */
#ifdef CONFIG_COMPAT
#include <linux/compat.h>
#endif
#include <sys/dmu_objset.h> #include <sys/dmu_objset.h>
#include <sys/zfs_vfsops.h> #include <sys/zfs_vfsops.h>
#include <sys/zfs_vnops.h> #include <sys/zfs_vnops.h>
...@@ -798,7 +801,17 @@ zpl_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ...@@ -798,7 +801,17 @@ zpl_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
static long static long
zpl_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) zpl_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{ {
return (zpl_ioctl(filp, cmd, arg)); switch (cmd) {
case FS_IOC32_GETFLAGS:
cmd = FS_IOC_GETFLAGS;
break;
case FS_IOC32_SETFLAGS:
cmd = FS_IOC_SETFLAGS;
break;
default:
return (-ENOTTY);
}
return (zpl_ioctl(filp, cmd, (unsigned long)compat_ptr(arg)));
} }
#endif /* CONFIG_COMPAT */ #endif /* CONFIG_COMPAT */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment