switch alloc_file() to passing struct path

[sfrench/cifs-2.6.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index eaaba3510e81009bb2e02799785dda8ff704e329..dbfdfa96d29b850c2f9a198cd494069772dbafc6 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -358,7 +358,7 @@ static const struct dentry_operations sockfs_dentry_operations = {
 static int sock_alloc_file(struct socket *sock, struct file **f, int flags)
 {
        struct qstr name = { .name = "" };
-       struct dentry *dentry;
+       struct path path;
        struct file *file;
        int fd;
 
@@ -366,28 +366,29 @@ static int sock_alloc_file(struct socket *sock, struct file **f, int flags)
        if (unlikely(fd < 0))
                return fd;
 
-       dentry = d_alloc(sock_mnt->mnt_sb->s_root, &name);
-       if (unlikely(!dentry)) {
+       path.dentry = d_alloc(sock_mnt->mnt_sb->s_root, &name);
+       if (unlikely(!path.dentry)) {
                put_unused_fd(fd);
                return -ENOMEM;
        }
+       path.mnt = mntget(sock_mnt);
 
-       dentry->d_op = &sockfs_dentry_operations;
+       path.dentry->d_op = &sockfs_dentry_operations;
        /*
         * We dont want to push this dentry into global dentry hash table.
         * We pretend dentry is already hashed, by unsetting DCACHE_UNHASHED
         * This permits a working /proc/$pid/fd/XXX on sockets
         */
-       dentry->d_flags &= ~DCACHE_UNHASHED;
-       d_instantiate(dentry, SOCK_INODE(sock));
+       path.dentry->d_flags &= ~DCACHE_UNHASHED;
+       d_instantiate(path.dentry, SOCK_INODE(sock));
        SOCK_INODE(sock)->i_fop = &socket_file_ops;
 
-       file = alloc_file(sock_mnt, dentry, FMODE_READ | FMODE_WRITE,
+       file = alloc_file(&path, FMODE_READ | FMODE_WRITE,
                  &socket_file_ops);
        if (unlikely(!file)) {
                /* drop dentry, keep inode */
                atomic_inc(&path.dentry->d_inode->i_count);
-               dput(dentry);
+               path_put(&path);
                put_unused_fd(fd);
                return -ENFILE;
        }