mirror of
https://github.com/torvalds/linux.git
synced 2026-05-26 16:12:59 +02:00
nfsctl cleanups and a fix
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQQqUNBr3gm4hGXdBJlZ7Krx/gZQ6wUCaNh7/wAKCRBZ7Krx/gZQ
6/3KAQDagTUkmyJzbYPVnCdxGrM/fx6eUO945JjhQcO/39+YQQEAqPrQXJgUAOsT
mlyJV2JBnDqDxy0JArkp1ejco7X/SQs=
=MqSN
-----END PGP SIGNATURE-----
Merge tag 'pull-nfsctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull nfsctl updates from Al Viro:
"nfsctl cleanups and a fix"
* tag 'pull-nfsctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
nfsd_get_inode(): lift setting ->i_{,f}op to callers.
nfsdfs_create_files(): switch to simple_start_creating()
_nfsd_symlink(): switch to simple_start_creating()
nfsd_mkdir(): switch to simple_start_creating()
nfsctl: symlink has no business bumping link count of parent directory
This commit is contained in:
Linus Torvalds
commit
867e4513fe
147
fs/nfsd/nfsctl.c
147
fs/nfsd/nfsctl.c
|
|
@ -1103,89 +1103,48 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size)
|
|||
* populating the filesystem.
|
||||
*/
|
||||
|
||||
/* Basically copying rpc_get_inode. */
|
||||
static struct inode *nfsd_get_inode(struct super_block *sb, umode_t mode)
|
||||
{
|
||||
struct inode *inode = new_inode(sb);
|
||||
if (!inode)
|
||||
return NULL;
|
||||
/* Following advice from simple_fill_super documentation: */
|
||||
inode->i_ino = iunique(sb, NFSD_MaxReserved);
|
||||
inode->i_mode = mode;
|
||||
simple_inode_init_ts(inode);
|
||||
switch (mode & S_IFMT) {
|
||||
case S_IFDIR:
|
||||
inode->i_fop = &simple_dir_operations;
|
||||
inode->i_op = &simple_dir_inode_operations;
|
||||
inc_nlink(inode);
|
||||
break;
|
||||
case S_IFLNK:
|
||||
inode->i_op = &simple_symlink_inode_operations;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
if (inode) {
|
||||
/* Following advice from simple_fill_super documentation: */
|
||||
inode->i_ino = iunique(sb, NFSD_MaxReserved);
|
||||
inode->i_mode = mode;
|
||||
simple_inode_init_ts(inode);
|
||||
}
|
||||
return inode;
|
||||
}
|
||||
|
||||
static int __nfsd_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode, struct nfsdfs_client *ncl)
|
||||
{
|
||||
struct inode *inode;
|
||||
|
||||
inode = nfsd_get_inode(dir->i_sb, mode);
|
||||
if (!inode)
|
||||
return -ENOMEM;
|
||||
if (ncl) {
|
||||
inode->i_private = ncl;
|
||||
kref_get(&ncl->cl_ref);
|
||||
}
|
||||
d_add(dentry, inode);
|
||||
inc_nlink(dir);
|
||||
fsnotify_mkdir(dir, dentry);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct dentry *nfsd_mkdir(struct dentry *parent, struct nfsdfs_client *ncl, char *name)
|
||||
{
|
||||
struct inode *dir = parent->d_inode;
|
||||
struct dentry *dentry;
|
||||
int ret = -ENOMEM;
|
||||
struct inode *inode;
|
||||
|
||||
inode_lock(dir);
|
||||
dentry = d_alloc_name(parent, name);
|
||||
if (!dentry)
|
||||
goto out_err;
|
||||
ret = __nfsd_mkdir(d_inode(parent), dentry, S_IFDIR | 0600, ncl);
|
||||
if (ret)
|
||||
goto out_err;
|
||||
out:
|
||||
inode = nfsd_get_inode(parent->d_sb, S_IFDIR | 0600);
|
||||
if (!inode)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
dentry = simple_start_creating(parent, name);
|
||||
if (IS_ERR(dentry)) {
|
||||
iput(inode);
|
||||
return dentry;
|
||||
}
|
||||
inode->i_fop = &simple_dir_operations;
|
||||
inode->i_op = &simple_dir_inode_operations;
|
||||
inc_nlink(inode);
|
||||
if (ncl) {
|
||||
inode->i_private = ncl;
|
||||
kref_get(&ncl->cl_ref);
|
||||
}
|
||||
d_instantiate(dentry, inode);
|
||||
inc_nlink(dir);
|
||||
fsnotify_mkdir(dir, dentry);
|
||||
inode_unlock(dir);
|
||||
return dentry;
|
||||
out_err:
|
||||
dput(dentry);
|
||||
dentry = ERR_PTR(ret);
|
||||
goto out;
|
||||
}
|
||||
|
||||
#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);
|
||||
inc_nlink(dir);
|
||||
fsnotify_create(dir, dentry);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* @content is assumed to be a NUL-terminated string that lives
|
||||
* longer than the symlink itself.
|
||||
|
|
@ -1194,17 +1153,25 @@ 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_op = &simple_symlink_inode_operations;
|
||||
inode->i_link = (char *)content;
|
||||
inode->i_size = strlen(content);
|
||||
|
||||
d_instantiate(dentry, inode);
|
||||
fsnotify_create(dir, dentry);
|
||||
inode_unlock(dir);
|
||||
}
|
||||
#else
|
||||
|
|
@ -1240,40 +1207,34 @@ struct nfsdfs_client *get_nfsdfs_client(struct inode *inode)
|
|||
|
||||
/* XXX: cut'n'paste from simple_fill_super; figure out if we could share
|
||||
* code instead. */
|
||||
static int nfsdfs_create_files(struct dentry *root,
|
||||
static int nfsdfs_create_files(struct dentry *root,
|
||||
const struct tree_descr *files,
|
||||
struct nfsdfs_client *ncl,
|
||||
struct dentry **fdentries)
|
||||
{
|
||||
struct inode *dir = d_inode(root);
|
||||
struct inode *inode;
|
||||
struct dentry *dentry;
|
||||
int i;
|
||||
|
||||
inode_lock(dir);
|
||||
for (i = 0; files->name && files->name[0]; i++, files++) {
|
||||
dentry = d_alloc_name(root, files->name);
|
||||
if (!dentry)
|
||||
goto out;
|
||||
inode = nfsd_get_inode(d_inode(root)->i_sb,
|
||||
S_IFREG | files->mode);
|
||||
if (!inode) {
|
||||
dput(dentry);
|
||||
goto out;
|
||||
for (int i = 0; files->name && files->name[0]; i++, files++) {
|
||||
struct inode *inode = nfsd_get_inode(root->d_sb,
|
||||
S_IFREG | files->mode);
|
||||
if (!inode)
|
||||
return -ENOMEM;
|
||||
dentry = simple_start_creating(root, files->name);
|
||||
if (IS_ERR(dentry)) {
|
||||
iput(inode);
|
||||
return PTR_ERR(dentry);
|
||||
}
|
||||
kref_get(&ncl->cl_ref);
|
||||
inode->i_fop = files->ops;
|
||||
inode->i_private = ncl;
|
||||
d_add(dentry, inode);
|
||||
d_instantiate(dentry, inode);
|
||||
fsnotify_create(dir, dentry);
|
||||
if (fdentries)
|
||||
fdentries[i] = dentry;
|
||||
inode_unlock(dir);
|
||||
}
|
||||
inode_unlock(dir);
|
||||
return 0;
|
||||
out:
|
||||
inode_unlock(dir);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
/* on success, returns positive number unique to that client. */
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user