On Tue, 3 May 2011 18:53:41 -0400 Erez Zadok <[email protected]> wrote:
> I'll take care of this right away. > > Cheers, > Erez. > > On May 3, 2011, at 12:43 AM, Stephen Hemminger wrote: > > > Unionfs 2.5.8 and 2.5.9 won't build on 64 bit with CONFIG_COMPAT defined > > because there is no "ioctl" entry in file ops any more. > > Looking at the code, it looks like a simple > > oversight where compat_ioctl was intended. Please compile test on 64 bit in > > future. > > > > Signed-off-by: Stephen Hemminger <[email protected]> > > > > diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c > > index 9f63b1c..ba80e44 100644 > > --- a/fs/unionfs/commonfops.c > > +++ b/fs/unionfs/commonfops.c > > @@ -742,7 +742,7 @@ static long do_ioctl(struct file *file, unsigned int > > cmd, unsigned long arg) > > 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); > > > Need to take of the inode argument as well... } else if (lower_file->f_op->compat_ioctl) { err = lower_file->f_op->compat_ioctl(lower_file, cmd, arg); _______________________________________________ unionfs mailing list: http://unionfs.filesystems.org/ [email protected] http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs
