_nfsd_symlink(): switch to simple_start_creating()

Reviewed-by: NeilBrown <neil@brown.name>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 6d60bc48f96e6a7a33d0aac1b41901b533ba4403..1b5e417784f6e31c7aeb0f3b80d67a6f676fd33e 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1155,23 +1155,6 @@ static struct dentry *nfsd_mkdir(struct dentry *parent, struct nfsdfs_client *nc
 }
 
 #if IS_ENABLED(CONFIG_SUNRPC_GSS)
-static int __nfsd_symlink(struct inode *dir, struct dentry *dentry,
-                         umode_t mode, const char *content)
-{
-       struct inode *inode;
-
-       inode = nfsd_get_inode(dir->i_sb, mode);
-       if (!inode)
-               return -ENOMEM;
-
-       inode->i_link = (char *)content;
-       inode->i_size = strlen(content);
-
-       d_add(dentry, inode);
-       fsnotify_create(dir, dentry);
-       return 0;
-}
-
 /*
  * @content is assumed to be a NUL-terminated string that lives
  * longer than the symlink itself.
@@ -1180,17 +1163,24 @@ static void _nfsd_symlink(struct dentry *parent, const char *name,
                          const char *content)
 {
        struct inode *dir = parent->d_inode;
+       struct inode *inode;
        struct dentry *dentry;
-       int ret;
 
-       inode_lock(dir);
-       dentry = d_alloc_name(parent, name);
-       if (!dentry)
-               goto out;
-       ret = __nfsd_symlink(d_inode(parent), dentry, S_IFLNK | 0777, content);
-       if (ret)
-               dput(dentry);
-out:
+       inode = nfsd_get_inode(dir->i_sb, S_IFLNK | 0777);
+       if (!inode)
+               return;
+
+       dentry = simple_start_creating(parent, name);
+       if (IS_ERR(dentry)) {
+               iput(inode);
+               return;
+       }
+
+       inode->i_link = (char *)content;
+       inode->i_size = strlen(content);
+
+       d_instantiate(dentry, inode);
+       fsnotify_create(dir, dentry);
        inode_unlock(dir);
 }
 #else