On Tue, Oct 26, 2010 at 5:04 PM, Matthew L. Creech <[email protected]> wrote:
> Hi,
>
> I appears that UnionFS for 2.6.36 fails to build when CONFIG_COMPAT is
> defined, because commonfops.c contains a reference to ioctl(). I'm
> assuming this was just an oversight since the next line references
> compat_ioctl(). Patch is attached, thanks.
>
Sorry, attached the wrong version - this one fixes the build error.
--
Matthew L. Creech
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
}
_______________________________________________
unionfs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs
