Author: arekm Date: Fri Mar 25 15:08:31 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- builds but grsec patch is from testing; tuxonice is from git
---- Files affected:
packages/kernel:
kernel-unionfs.patch (1.12 -> 1.13)
---- Diffs:
================================================================
Index: packages/kernel/kernel-unionfs.patch
diff -u packages/kernel/kernel-unionfs.patch:1.12
packages/kernel/kernel-unionfs.patch:1.13
--- packages/kernel/kernel-unionfs.patch:1.12 Wed Mar 16 15:07:57 2011
+++ packages/kernel/kernel-unionfs.patch Fri Mar 25 16:08:26 2011
@@ -11287,3 +11287,19 @@
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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-unionfs.patch?r1=1.12&r2=1.13&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
