mirror of https://github.com/torvalds/linux.git
nfsdfs_create_files(): 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>
This commit is contained in:
parent
a6281a7043
commit
e59f06bb5d
|
|
@ -1222,34 +1222,28 @@ static int nfsdfs_create_files(struct dentry *root,
|
||||||
struct dentry **fdentries)
|
struct dentry **fdentries)
|
||||||
{
|
{
|
||||||
struct inode *dir = d_inode(root);
|
struct inode *dir = d_inode(root);
|
||||||
struct inode *inode;
|
|
||||||
struct dentry *dentry;
|
struct dentry *dentry;
|
||||||
int i;
|
|
||||||
|
|
||||||
inode_lock(dir);
|
for (int i = 0; files->name && files->name[0]; i++, files++) {
|
||||||
for (i = 0; files->name && files->name[0]; i++, files++) {
|
struct inode *inode = nfsd_get_inode(root->d_sb,
|
||||||
dentry = d_alloc_name(root, files->name);
|
|
||||||
if (!dentry)
|
|
||||||
goto out;
|
|
||||||
inode = nfsd_get_inode(d_inode(root)->i_sb,
|
|
||||||
S_IFREG | files->mode);
|
S_IFREG | files->mode);
|
||||||
if (!inode) {
|
if (!inode)
|
||||||
dput(dentry);
|
return -ENOMEM;
|
||||||
goto out;
|
dentry = simple_start_creating(root, files->name);
|
||||||
|
if (IS_ERR(dentry)) {
|
||||||
|
iput(inode);
|
||||||
|
return PTR_ERR(dentry);
|
||||||
}
|
}
|
||||||
kref_get(&ncl->cl_ref);
|
kref_get(&ncl->cl_ref);
|
||||||
inode->i_fop = files->ops;
|
inode->i_fop = files->ops;
|
||||||
inode->i_private = ncl;
|
inode->i_private = ncl;
|
||||||
d_add(dentry, inode);
|
d_instantiate(dentry, inode);
|
||||||
fsnotify_create(dir, dentry);
|
fsnotify_create(dir, dentry);
|
||||||
if (fdentries)
|
if (fdentries)
|
||||||
fdentries[i] = dentry;
|
fdentries[i] = dentry;
|
||||||
|
inode_unlock(dir);
|
||||||
}
|
}
|
||||||
inode_unlock(dir);
|
|
||||||
return 0;
|
return 0;
|
||||||
out:
|
|
||||||
inode_unlock(dir);
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* on success, returns positive number unique to that client. */
|
/* on success, returns positive number unique to that client. */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue