- builds but grsec patch is from testing; tuxonice is from git

Changed files:
    kernel-unionfs.patch -> 1.13

diff --git a/kernel-unionfs.patch b/kernel-unionfs.patch
index 48d134b00e4d65472631c0523839f652593e8ef0..a48696a898765356e200d3dfbcc626f83629ad4e 100644 (file)
--- a/kernel-unionfs.patch
+++ b/kernel-unionfs.patch
@@ -11287,3 +11287,19 @@ index 7b7308a..abdb5a5 100644
  
  int security_inode_exec_permission(struct inode *inode, unsigned int flags)
  {
+diff -purN orig/fs/unionfs/commonfops.c linux-2.6.36/fs/unionfs/commonfops.c
+--- orig/fs/unionfs/commonfops.c       2010-10-21 16:29:51.033693283 -0400
++++ linux-2.6.36/fs/unionfs/commonfops.c       2010-10-27 10:15:30.337131546 -0400
+@@ -740,10 +740,8 @@ static long do_ioctl(struct file *file, 
+       if (lower_file->f_op->unlocked_ioctl) {
+               err = lower_file->f_op->unlocked_ioctl(lower_file, cmd, arg);
+ #ifdef CONFIG_COMPAT
+-      } else if (lower_file->f_op->ioctl) {
+-              err = lower_file->f_op->compat_ioctl(
+-                      lower_file->f_path.dentry->d_inode,
+-                      lower_file, cmd, arg);
++      } else if (lower_file->f_op->compat_ioctl) {
++              err = lower_file->f_op->compat_ioctl(lower_file, cmd, arg);
+ #endif
+       }
+ 
\ No newline at end of file