On Fri, Jan 23, 2009 at 10:09:55AM +0300, Cyrill Gorcunov wrote:
> [Stephen Rothwell - Fri, Jan 23, 2009 at 05:15:15PM +1100]
> | Hi Alexey,
> |
> | Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> |
> | drivers/net/pppoe.c: In function 'pppoe_seq_open':
> | drivers/net/pppoe.c:1102: error: implicit declaration of function 'PDE_NET'
> | drivers/net/pppol2tp.c: In function 'pppol2tp_proc_open':
> | drivers/net/pppol2tp.c:2579: error: implicit declaration of function 'PDE_NET'
> |
> | Caused by commits a6bcf1c1d38e0672db35e0d9f2504ac04ddf3ed5 ("net: pppoe -
> | introduce net-namespace functionality") and
> | 4e9fb8016a351b5b9da7fea32bcfdbc9d836e421 ("net: pppol2tp - introduce
> | net-namespace functionality") from the net tree interacting with commit
> | 0e6a2bfcbae4ee3cf770a6a5da203b4a336ff8ff ("proc 5/6: simplify network
> | namespace lookup") from the proc tree.
> |
> | I added the following fix to the merge and can carry it as necessary.
> |
> | I expect that there is a better fix for this, though. These are the only
> | references to PDE_NET outside fs/proc.
> | --
> | Cheers,
> | Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
> | http://www.canb.auug.org.au/~sfr/
> |
> | diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
> | index 798b8cf..3aabf92 100644
> | --- a/drivers/net/pppoe.c
> | +++ b/drivers/net/pppoe.c
> | @@ -1099,7 +1099,7 @@ static int pppoe_seq_open(struct inode *inode, struct file *file)
> | return err;
> |
> | m = file->private_data;
> | - net = maybe_get_net(PDE_NET(PDE(inode)));
> | + net = maybe_get_net(inode->i_sb->s_fs_info);
> | BUG_ON(!net);
> | m->private = net;
> |
> | diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
> | index 056e22a..d21470f 100644
> | --- a/drivers/net/pppol2tp.c
> | +++ b/drivers/net/pppol2tp.c
> | @@ -2576,7 +2576,7 @@ static int pppol2tp_proc_open(struct inode *inode, struct file *file)
> | goto out;
> |
> | pd = m->private;
> | - net = maybe_get_net(PDE_NET(PDE(inode)));
> | + net = maybe_get_net(inode->i_sb->s_fs_info);
> | BUG_ON(!net);
> | pd->seq_net = net;
> | return 0;
> |
>
> Hi Stephen,
>
> thanks for catching this. Until I miss something --
> s_fs_info for /proc is struct pid_namespace* right?
> So maybe_get_net will convert it to net*, which is
> not right I guess. On the other hand -- and PDE, and
> PDE_NET is defined in proc_fs.h regardless if CONIG_PROC_FS
> is turned on/off. Confused...
>
> (to be fair -- this maybe_get_net(PDE_NET(PDE(inode))) is
> taken from proc_net.c:get_proc_net, but to eliminate #ifdef
> I reimplemented it, which is not good too -- maybe I've been
> to put get_proc_net into some header, Eric?)
PDE_NET here is bogus. you should use seq_open_net/seq_release_net.
See how other code does this, plenty of examples.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
