Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / fs / nsfs.c

diff --git a/fs/nsfs.c b/fs/nsfs.c
index fb7b397..8718af8 100644 (file)
--- a/fs/nsfs.c
+++ b/fs/nsfs.c
@@ -51,7 +51,7 @@ static void nsfs_evict(struct inode *inode)
 
 static void *__ns_get_path(struct path *path, struct ns_common *ns)
 {
-       struct vfsmount *mnt = mntget(nsfs_mnt);
+       struct vfsmount *mnt = nsfs_mnt;
        struct qstr qname = { .name = "", };
        struct dentry *dentry;
        struct inode *inode;
@@ -67,7 +67,7 @@ static void *__ns_get_path(struct path *path, struct ns_common *ns)
        rcu_read_unlock();
        ns->ops->put(ns);
 got_it:
-       path->mnt = mnt;
+       path->mnt = mntget(mnt);
        path->dentry = dentry;
        return NULL;
 slow:
@@ -75,11 +75,10 @@ slow:
        inode = new_inode_pseudo(mnt->mnt_sb);
        if (!inode) {
                ns->ops->put(ns);
-               mntput(mnt);
                return ERR_PTR(-ENOMEM);
        }
        inode->i_ino = ns->inum;
-       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+       inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
        inode->i_flags |= S_IMMUTABLE;
        inode->i_mode = S_IFREG | S_IRUGO;
        inode->i_fop = &ns_file_operations;
@@ -88,7 +87,6 @@ slow:
        dentry = d_alloc_pseudo(mnt->mnt_sb, &qname);
        if (!dentry) {
                iput(inode);
-               mntput(mnt);
                return ERR_PTR(-ENOMEM);
        }
        d_instantiate(dentry, inode);
@@ -97,7 +95,6 @@ slow:
        if (d) {
                d_delete(dentry);       /* make sure ->d_prune() does nothing */
                dput(dentry);
-               mntput(mnt);
                cpu_relax();
                return ERR_PTR(-EAGAIN);
        }