Re: [patch] epoll for 2.4.20 updated ...

[Davide Libenzi]

On Sun, 26 Jan 2003, J.A. Magallon wrote:

>
> On 2003.01.25 Davide Libenzi wrote:
> >
> > I updated the 2.4.20 patch with the changes posted today and I fixed a
> > little error about the wait queue function prototype :
> >
> > http://www.xmailserver.org/linux-patches/sys_epoll-2.4.20-0.61.diff
> >
>
> I needed this to build smbfs:
>
> --- linux-2.4.21-pre3-jam3/fs/smbfs/sock.c.orig	2003-01-26 01:02:32.000000000 +0100
> +++ linux-2.4.21-pre3-jam3/fs/smbfs/sock.c	2003-01-26 01:03:11.000000000 +0100
> @@ -314,7 +314,7 @@
>  smb_receive_poll(struct smb_sb_info *server)
>  {
>  	struct file *file = server->sock_file;
> -	poll_table wait_table;
> +	struct poll_wqueues wait_table;
>  	int result = 0;
>  	int timeout = server->mnt->timeo * HZ;
>  	int mask;
> @@ -323,7 +323,7 @@
>  		poll_initwait(&wait_table);
>                  set_current_state(TASK_INTERRUPTIBLE);
>
> -		mask = file->f_op->poll(file, &wait_table);
> +		mask = file->f_op->poll(file, &wait_table.pt);
>  		if (mask & POLLIN) {
>  			poll_freewait(&wait_table);
>  			current->state = TASK_RUNNING;
>
> Is it correct ?

I thought this was already been reported and fixed. Your fix is fine, I'll
make 0.62 ...

- Davide