mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

nfs: change mkdir inode_operation to return alternate dentry if needed.

Browse source 
mkdir now allows a different dentry to be returned which is sometimes
relevant for nfs.

This patch changes the nfs_rpc_ops mkdir op to return a dentry, and
passes that back to the caller.

The mkdir nfs_rpc_op will return NULL if the original dentry should be
used.  This matches the mkdir inode_operation.

nfs4_do_create() is duplicated to nfs4_do_mkdir() which is changed to
handle the specifics of directories.  Consequently the current special
handling for directories is removed from nfs4_do_create()

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: NeilBrown <neilb@suse.de>
Link: https://lore.kernel.org/r/20250227013949.536172-6-neilb@suse.de
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
NeilBrown 2025-02-27 12:32:57 +11:00 committed by Christian Brauner
parent d701902c13
commit 8376583b84
No known key found for this signature in database
GPG key ID: 91C61BC06578DCA2
5 changed files with 60 additions and 39 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

13
fs/nfs/dir.c
View file

@ -2426,7 +2426,7 @@ struct dentry *nfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,
struct dentry *dentry, umode_t mode) struct dentry *dentry, umode_t mode)
{ {
struct iattr attr; struct iattr attr;
int error; struct dentry *ret;
dfprintk(VFS, "NFS: mkdir(%s/%lu), %pd\n", dfprintk(VFS, "NFS: mkdir(%s/%lu), %pd\n",
dir->i_sb->s_id, dir->i_ino, dentry); dir->i_sb->s_id, dir->i_ino, dentry);
@ -2435,14 +2435,9 @@ struct dentry *nfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,
attr.ia_mode = mode | S_IFDIR; attr.ia_mode = mode | S_IFDIR;
trace_nfs_mkdir_enter(dir, dentry); trace_nfs_mkdir_enter(dir, dentry);
error = NFS_PROTO(dir)->mkdir(dir, dentry, &attr); ret = NFS_PROTO(dir)->mkdir(dir, dentry, &attr);
trace_nfs_mkdir_exit(dir, dentry, error); trace_nfs_mkdir_exit(dir, dentry, PTR_ERR_OR_ZERO(ret));
if (error != 0) return ret;
goto out_err;
return NULL;
out_err:
d_drop(dentry);
return ERR_PTR(error);
} }
EXPORT_SYMBOL_GPL(nfs_mkdir); EXPORT_SYMBOL_GPL(nfs_mkdir);

29
fs/nfs/nfs3proc.c
View file

@ -578,13 +578,13 @@ nfs3_proc_symlink(struct inode *dir, struct dentry *dentry, struct folio *folio,
return status; return status;
} }
static int static struct dentry *
nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
{ {
struct posix_acl *default_acl, *acl; struct posix_acl *default_acl, *acl;
struct nfs3_createdata *data; struct nfs3_createdata *data;
struct dentry *d_alias; struct dentry *ret = ERR_PTR(-ENOMEM);
int status = -ENOMEM; int status;
dprintk("NFS call mkdir %pd\n", dentry); dprintk("NFS call mkdir %pd\n", dentry);
@ -592,8 +592,9 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
if (data == NULL) if (data == NULL)
goto out; goto out;
status = posix_acl_create(dir, &sattr->ia_mode, &default_acl, &acl); ret = ERR_PTR(posix_acl_create(dir, &sattr->ia_mode,
if (status) &default_acl, &acl));
if (IS_ERR(ret))
goto out; goto out;
data->msg.rpc_proc = &nfs3_procedures[NFS3PROC_MKDIR]; data->msg.rpc_proc = &nfs3_procedures[NFS3PROC_MKDIR];
@ -602,25 +603,27 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
data->arg.mkdir.len = dentry->d_name.len; data->arg.mkdir.len = dentry->d_name.len;
data->arg.mkdir.sattr = sattr; data->arg.mkdir.sattr = sattr;
d_alias = nfs3_do_create(dir, dentry, data); ret = nfs3_do_create(dir, dentry, data);
status = PTR_ERR_OR_ZERO(d_alias);
if (status != 0) if (IS_ERR(ret))
goto out_release_acls; goto out_release_acls;
if (d_alias) if (ret)
dentry = d_alias; dentry = ret;
status = nfs3_proc_setacls(d_inode(dentry), acl, default_acl); status = nfs3_proc_setacls(d_inode(dentry), acl, default_acl);
if (status) {
dput(ret);
ret = ERR_PTR(status);
}
dput(d_alias);
out_release_acls: out_release_acls:
posix_acl_release(acl); posix_acl_release(acl);
posix_acl_release(default_acl); posix_acl_release(default_acl);
out: out:
nfs3_free_createdata(data); nfs3_free_createdata(data);
dprintk("NFS reply mkdir: %d\n", status); dprintk("NFS reply mkdir: %d\n", PTR_ERR_OR_ZERO(ret));
return status; return ret;
} }
static int static int

43
fs/nfs/nfs4proc.c
View file

@ -5133,9 +5133,6 @@ static int nfs4_do_create(struct inode *dir, struct dentry *dentry, struct nfs4_
&data->arg.seq_args, &data->res.seq_res, 1); &data->arg.seq_args, &data->res.seq_res, 1);
if (status == 0) { if (status == 0) {
spin_lock(&dir->i_lock); spin_lock(&dir->i_lock);
/* Creating a directory bumps nlink in the parent */
if (data->arg.ftype == NF4DIR)
nfs4_inc_nlink_locked(dir);
nfs4_update_changeattr_locked(dir, &data->res.dir_cinfo, nfs4_update_changeattr_locked(dir, &data->res.dir_cinfo,
data->res.fattr->time_start, data->res.fattr->time_start,
NFS_INO_INVALID_DATA); NFS_INO_INVALID_DATA);
@ -5145,6 +5142,25 @@ static int nfs4_do_create(struct inode *dir, struct dentry *dentry, struct nfs4_
return status; return status;
} }
static struct dentry *nfs4_do_mkdir(struct inode *dir, struct dentry *dentry,
struct nfs4_createdata *data)
{
int status = nfs4_call_sync(NFS_SERVER(dir)->client, NFS_SERVER(dir), &data->msg,
&data->arg.seq_args, &data->res.seq_res, 1);
if (status)
return ERR_PTR(status);
spin_lock(&dir->i_lock);
/* Creating a directory bumps nlink in the parent */
nfs4_inc_nlink_locked(dir);
nfs4_update_changeattr_locked(dir, &data->res.dir_cinfo,
data->res.fattr->time_start,
NFS_INO_INVALID_DATA);
spin_unlock(&dir->i_lock);
return nfs_add_or_obtain(dentry, data->res.fh, data->res.fattr);
}
static void nfs4_free_createdata(struct nfs4_createdata *data) static void nfs4_free_createdata(struct nfs4_createdata *data)
{ {
nfs4_label_free(data->fattr.label); nfs4_label_free(data->fattr.label);
@ -5201,32 +5217,34 @@ static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,
return err; return err;
} }
static int _nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, static struct dentry *_nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
struct iattr *sattr, struct nfs4_label *label) struct iattr *sattr,
struct nfs4_label *label)
{ {
struct nfs4_createdata *data; struct nfs4_createdata *data;
int status = -ENOMEM; struct dentry *ret = ERR_PTR(-ENOMEM);
data = nfs4_alloc_createdata(dir, &dentry->d_name, sattr, NF4DIR); data = nfs4_alloc_createdata(dir, &dentry->d_name, sattr, NF4DIR);
if (data == NULL) if (data == NULL)
goto out; goto out;
data->arg.label = label; data->arg.label = label;
status = nfs4_do_create(dir, dentry, data); ret = nfs4_do_mkdir(dir, dentry, data);
nfs4_free_createdata(data); nfs4_free_createdata(data);
out: out:
return status; return ret;
} }
static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, static struct dentry *nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
struct iattr *sattr) struct iattr *sattr)
{ {
struct nfs_server *server = NFS_SERVER(dir); struct nfs_server *server = NFS_SERVER(dir);
struct nfs4_exception exception = { struct nfs4_exception exception = {
.interruptible = true, .interruptible = true,
}; };
struct nfs4_label l, *label; struct nfs4_label l, *label;
struct dentry *alias;
int err; int err;
label = nfs4_label_init_security(dir, dentry, sattr, &l); label = nfs4_label_init_security(dir, dentry, sattr, &l);
@ -5234,14 +5252,15 @@ static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
if (!(server->attr_bitmask[2] & FATTR4_WORD2_MODE_UMASK)) if (!(server->attr_bitmask[2] & FATTR4_WORD2_MODE_UMASK))
sattr->ia_mode &= ~current_umask(); sattr->ia_mode &= ~current_umask();
do { do {
err = _nfs4_proc_mkdir(dir, dentry, sattr, label); alias = _nfs4_proc_mkdir(dir, dentry, sattr, label);
err = PTR_ERR_OR_ZERO(alias);
trace_nfs4_mkdir(dir, &dentry->d_name, err); trace_nfs4_mkdir(dir, &dentry->d_name, err);
err = nfs4_handle_exception(NFS_SERVER(dir), err, err = nfs4_handle_exception(NFS_SERVER(dir), err,
&exception); &exception);
} while (exception.retry); } while (exception.retry);
nfs4_label_release_security(label); nfs4_label_release_security(label);
return err; return alias;
} }
static int _nfs4_proc_readdir(struct nfs_readdir_arg *nr_arg, static int _nfs4_proc_readdir(struct nfs_readdir_arg *nr_arg,

12
fs/nfs/proc.c
View file

@ -446,13 +446,14 @@ nfs_proc_symlink(struct inode *dir, struct dentry *dentry, struct folio *folio,
return status; return status;
} }
static int static struct dentry *
nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
{ {
struct nfs_createdata *data; struct nfs_createdata *data;
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs_procedures[NFSPROC_MKDIR], .rpc_proc = &nfs_procedures[NFSPROC_MKDIR],
}; };
struct dentry *alias = NULL;
int status = -ENOMEM; int status = -ENOMEM;
dprintk("NFS call mkdir %pd\n", dentry); dprintk("NFS call mkdir %pd\n", dentry);
@ -464,12 +465,15 @@ nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
nfs_mark_for_revalidate(dir); nfs_mark_for_revalidate(dir);
if (status == 0) if (status == 0) {
status = nfs_instantiate(dentry, data->res.fh, data->res.fattr); alias = nfs_add_or_obtain(dentry, data->res.fh, data->res.fattr);
status = PTR_ERR_OR_ZERO(alias);
} else
alias = ERR_PTR(status);
nfs_free_createdata(data); nfs_free_createdata(data);
out: out:
dprintk("NFS reply mkdir: %d\n", status); dprintk("NFS reply mkdir: %d\n", status);
return status; return alias;
} }
static int static int

2
include/linux/nfs_xdr.h
View file

@ -1802,7 +1802,7 @@ struct nfs_rpc_ops {
int (*link) (struct inode *, struct inode *, const struct qstr *); int (*link) (struct inode *, struct inode *, const struct qstr *);
int (*symlink) (struct inode *, struct dentry *, struct folio *, int (*symlink) (struct inode *, struct dentry *, struct folio *,
unsigned int, struct iattr *); unsigned int, struct iattr *);
int (*mkdir) (struct inode *, struct dentry *, struct iattr *); struct dentry *(*mkdir) (struct inode *, struct dentry *, struct iattr *);
int (*rmdir) (struct inode *, const struct qstr *); int (*rmdir) (struct inode *, const struct qstr *);
int (*readdir) (struct nfs_readdir_arg *, struct nfs_readdir_res *); int (*readdir) (struct nfs_readdir_arg *, struct nfs_readdir_res *);
int (*mknod) (struct inode *, struct dentry *, struct iattr *, int (*mknod) (struct inode *, struct dentry *, struct iattr *,