packages (LINUX_2_6_37): kernel/kernel-unionfs.patch - fix comapt_ioctl

baggins baggins at pld-linux.org
Wed Mar 23 23:32:19 CET 2011


Author: baggins                      Date: Wed Mar 23 22:32:19 2011 GMT
Module: packages                      Tag: LINUX_2_6_37
---- Log message:
- fix comapt_ioctl

---- Files affected:
packages/kernel:
   kernel-unionfs.patch (1.11.2.1 -> 1.11.2.2) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-unionfs.patch
diff -u packages/kernel/kernel-unionfs.patch:1.11.2.1 packages/kernel/kernel-unionfs.patch:1.11.2.2
--- packages/kernel/kernel-unionfs.patch:1.11.2.1	Wed Mar 23 18:06:34 2011
+++ packages/kernel/kernel-unionfs.patch	Wed Mar 23 23:32:14 2011
@@ -749,7 +749,7 @@
 index 0000000..51ea65e
 --- /dev/null
 +++ b/fs/unionfs/commonfops.c
-@@ -0,0 +1,896 @@
+@@ -0,0 +1,895 @@
 +/*
 + * Copyright (c) 2003-2010 Erez Zadok
 + * Copyright (c) 2003-2006 Charles P. Wright
@@ -1492,9 +1492,8 @@
 +	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) {
++	} else if (lower_file->f_op->compat_ioctl) {
 +		err = lower_file->f_op->compat_ioctl(
-+			lower_file->f_path.dentry->d_inode,
 +			lower_file, cmd, arg);
 +#endif
 +	}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-unionfs.patch?r1=1.11.2.1&r2=1.11.2.2&f=u



More information about the pld-cvs-commit mailing list