Subject: Re: [RFC PATCH 4/6] networking: rework socket to fd mapping using
 alloc-file
From: Eric Paris <eparis@redhat.com>
To: David Miller <davem@davemloft.net>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
       linux-mm@kvack.org, viro@zeniv.linux.org.uk, jmorris@namei.org,
       npiggin@suse.de, zohar@us.ibm.com, jack@suse.cz, jmalicki@metacarta.com,
       dsmith@redhat.com, serue@us.ibm.com, hch@lst.de, john@johnmccutchan.com,
       rlove@rlove.org, ebiederm@xmission.com, heiko.carstens@de.ibm.com,
       penguin-kernel@I-love.SAKURA.ne.jp, mszeredi@suse.cz,
       jens.axboe@oracle.com, akpm@linux-foundation.org, matthew@wil.cx,
       hugh.dickins@tiscali.co.uk, kamezawa.hiroyu@jp.fujitsu.com,
       nishimura@mxp.nes.nec.co.jp, arnd@arndb.de, eric.dumazet@gmail.com
In-Reply-To: <20091203.140045.67902314.davem@davemloft.net>
References: <20091203195851.8925.30926.stgit@paris.rdu.redhat.com>
	 <20091203195917.8925.84203.stgit@paris.rdu.redhat.com>
	 <20091203.140045.67902314.davem@davemloft.net>
Content-Type: text/plain; charset="UTF-8"
Date: Thu, 03 Dec 2009 18:24:30 -0500
Message-Id: <1259882670.2670.20.camel@localhost>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1453
Lines: 42

On Thu, 2009-12-03 at 14:00 -0800, David Miller wrote:
> From: Eric Paris <eparis@redhat.com>
> Date: Thu, 03 Dec 2009 14:59:17 -0500
> 
> > Currently the networking code does interesting things allocating its struct
> > file and file descriptors.  This patch attempts to unify all of that and
> > simplify the error paths.  It is also a part of my patch series trying to get
> > rid of init-file and get-empty_filp and friends.
> > 
> > Signed-off-by: Eric Paris <eparis@redhat.com>
> 
> I'm fine with this:
> 
> Acked-by: David S. Miller <davem@davemloft.net>

It's actually busted, I forgot to actually pass back the new file in
sock_alloc_fd().  But I've got a fixed version and will resend the
series once I see other comments....

inc diff below in case anyone is trying to test this series.

diff --git a/net/socket.c b/net/socket.c
index 41ac0b1..6620421 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -390,6 +390,7 @@ static int sock_alloc_fd(struct file **filep, struct
socket *sock, int flags)
                goto out_err;
        }
 
+       *filep = file;
        sock->file = file;
        SOCK_INODE(sock)->i_fop = &socket_file_ops;
        file->f_flags = O_RDWR | (flags & O_NONBLOCK);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/