include/asm-x86/kexec.h: checkpatch cleanups - formatting only

[sfrench/cifs-2.6.git] / fs / anon_inodes.c

diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c
index b4a75880f6fd175b2f1f07d4c97c3a95024e5bfb..f42be069e085b2d212b8cc633d61f418be6801f5 100644 (file)
--- a/fs/anon_inodes.c
+++ b/fs/anon_inodes.c
@@ -76,25 +76,15 @@ int anon_inode_getfd(int *pfd, struct inode **pinode, struct file **pfile,
 {
        struct qstr this;
        struct dentry *dentry;
-       struct inode *inode;
        struct file *file;
        int error, fd;
 
        if (IS_ERR(anon_inode_inode))
                return -ENODEV;
-       file = get_empty_filp();
-       if (!file)
-               return -ENFILE;
-
-       inode = igrab(anon_inode_inode);
-       if (IS_ERR(inode)) {
-               error = PTR_ERR(inode);
-               goto err_put_filp;
-       }
 
        error = get_unused_fd();
        if (error < 0)
-               goto err_iput;
+               return error;
        fd = error;
 
        /*
@@ -108,35 +98,42 @@ int anon_inode_getfd(int *pfd, struct inode **pinode, struct file **pfile,
        dentry = d_alloc(anon_inode_mnt->mnt_sb->s_root, &this);
        if (!dentry)
                goto err_put_unused_fd;
+
+       /*
+        * We know the anon_inode inode count is always greater than zero,
+        * so we can avoid doing an igrab() and we can use an open-coded
+        * atomic_inc().
+        */
+       atomic_inc(&anon_inode_inode->i_count);
+
        dentry->d_op = &anon_inodefs_dentry_operations;
        /* Do not publish this dentry inside the global dentry hash table */
        dentry->d_flags &= ~DCACHE_UNHASHED;
-       d_instantiate(dentry, inode);
+       d_instantiate(dentry, anon_inode_inode);
 
-       file->f_path.mnt = mntget(anon_inode_mnt);
-       file->f_path.dentry = dentry;
-       file->f_mapping = inode->i_mapping;
+       error = -ENFILE;
+       file = alloc_file(anon_inode_mnt, dentry,
+                         FMODE_READ | FMODE_WRITE, fops);
+       if (!file)
+               goto err_dput;
+       file->f_mapping = anon_inode_inode->i_mapping;
 
        file->f_pos = 0;
        file->f_flags = O_RDWR;
-       file->f_op = fops;
-       file->f_mode = FMODE_READ | FMODE_WRITE;
        file->f_version = 0;
        file->private_data = priv;
 
        fd_install(fd, file);
 
        *pfd = fd;
-       *pinode = inode;
+       *pinode = anon_inode_inode;
        *pfile = file;
        return 0;
 
+err_dput:
+       dput(dentry);
 err_put_unused_fd:
        put_unused_fd(fd);
-err_iput:
-       iput(inode);
-err_put_filp:
-       put_filp(file);
        return error;
 }
 EXPORT_SYMBOL_GPL(anon_inode_getfd);