Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 07:50:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NFS: Remove the f_label from the nfs4_opendata and nfs_openres

Browse Source 
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Anna Schumaker 2021-10-22 13:11:06 -04:00 committed by Trond Myklebust
parent ba4bc8dc4d
commit 76baa2b29c
4 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/nfs/nfs4_fs.h
View File

@ -234,7 +234,6 @@ struct nfs4_opendata {
struct nfs4_string group_name; struct nfs4_string group_name;
struct nfs4_label *a_label; struct nfs4_label *a_label;
struct nfs_fattr f_attr; struct nfs_fattr f_attr;
struct nfs4_label *f_label;
struct dentry *dir; struct dentry *dir;
struct dentry *dentry; struct dentry *dentry;
struct nfs4_state_owner *owner; struct nfs4_state_owner *owner;

35
fs/nfs/nfs4proc.c
View File

@ -1329,7 +1329,6 @@ nfs4_map_atomic_open_claim(struct nfs_server *server,
static void nfs4_init_opendata_res(struct nfs4_opendata *p) static void nfs4_init_opendata_res(struct nfs4_opendata *p)
{ {
p->o_res.f_attr = &p->f_attr; p->o_res.f_attr = &p->f_attr;
p->o_res.f_label = p->f_label;
p->o_res.seqid = p->o_arg.seqid; p->o_res.seqid = p->o_arg.seqid;
p->c_res.seqid = p->c_arg.seqid; p->c_res.seqid = p->c_arg.seqid;
p->o_res.server = p->o_arg.server; p->o_res.server = p->o_arg.server;
@ -1355,8 +1354,8 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
if (p == NULL) if (p == NULL)
goto err; goto err;
p->f_label = nfs4_label_alloc(server, gfp_mask); p->f_attr.label = nfs4_label_alloc(server, gfp_mask);
if (IS_ERR(p->f_label)) if (IS_ERR(p->f_attr.label))
goto err_free_p; goto err_free_p;
p->a_label = nfs4_label_alloc(server, gfp_mask); p->a_label = nfs4_label_alloc(server, gfp_mask);
@ -1434,7 +1433,7 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
err_free_label: err_free_label:
nfs4_label_free(p->a_label); nfs4_label_free(p->a_label);
err_free_f: err_free_f:
nfs4_label_free(p->f_label); nfs4_label_free(p->f_attr.label);
err_free_p: err_free_p:
kfree(p); kfree(p);
err: err:
@ -1456,7 +1455,7 @@ static void nfs4_opendata_free(struct kref *kref)
nfs4_put_state_owner(p->owner); nfs4_put_state_owner(p->owner);
nfs4_label_free(p->a_label); nfs4_label_free(p->a_label);
nfs4_label_free(p->f_label); nfs4_label_free(p->f_attr.label);
dput(p->dir); dput(p->dir);
dput(p->dentry); dput(p->dentry);
@ -2009,7 +2008,7 @@ nfs4_opendata_get_inode(struct nfs4_opendata *data)
if (!(data->f_attr.valid & NFS_ATTR_FATTR)) if (!(data->f_attr.valid & NFS_ATTR_FATTR))
return ERR_PTR(-EAGAIN); return ERR_PTR(-EAGAIN);
inode = nfs_fhget(data->dir->d_sb, &data->o_res.fh, inode = nfs_fhget(data->dir->d_sb, &data->o_res.fh,
&data->f_attr, data->f_label); &data->f_attr, data->f_attr.label);
break; break;
default: default:
inode = d_inode(data->dentry); inode = d_inode(data->dentry);
@ -2709,7 +2708,7 @@ static int _nfs4_proc_open(struct nfs4_opendata *data,
if (!(o_res->f_attr->valid & NFS_ATTR_FATTR)) { if (!(o_res->f_attr->valid & NFS_ATTR_FATTR)) {
nfs4_sequence_free_slot(&o_res->seq_res); nfs4_sequence_free_slot(&o_res->seq_res);
nfs4_proc_getattr(server, &o_res->fh, o_res->f_attr, nfs4_proc_getattr(server, &o_res->fh, o_res->f_attr,
o_res->f_label, NULL); o_res->f_attr->label, NULL);
} }
return 0; return 0;
} }
@ -3125,7 +3124,6 @@ static int _nfs4_do_open(struct inode *dir,
enum open_claim_type4 claim = NFS4_OPEN_CLAIM_NULL; enum open_claim_type4 claim = NFS4_OPEN_CLAIM_NULL;
struct iattr *sattr = c->sattr; struct iattr *sattr = c->sattr;
struct nfs4_label *label = c->label; struct nfs4_label *label = c->label;
struct nfs4_label *olabel = NULL;
int status; int status;
/* Protect against reboot recovery conflicts */ /* Protect against reboot recovery conflicts */
@ -3148,19 +3146,11 @@ static int _nfs4_do_open(struct inode *dir,
if (opendata == NULL) if (opendata == NULL)
goto err_put_state_owner; goto err_put_state_owner;
if (label) {
olabel = nfs4_label_alloc(server, GFP_KERNEL);
if (IS_ERR(olabel)) {
status = PTR_ERR(olabel);
goto err_opendata_put;
}
}
if (server->attr_bitmask[2] & FATTR4_WORD2_MDSTHRESHOLD) { if (server->attr_bitmask[2] & FATTR4_WORD2_MDSTHRESHOLD) {
if (!opendata->f_attr.mdsthreshold) { if (!opendata->f_attr.mdsthreshold) {
opendata->f_attr.mdsthreshold = pnfs_mdsthreshold_alloc(); opendata->f_attr.mdsthreshold = pnfs_mdsthreshold_alloc();
if (!opendata->f_attr.mdsthreshold) if (!opendata->f_attr.mdsthreshold)
goto err_free_label; goto err_opendata_put;
} }
opendata->o_arg.open_bitmap = &nfs4_pnfs_open_bitmap[0]; opendata->o_arg.open_bitmap = &nfs4_pnfs_open_bitmap[0];
} }
@ -3169,7 +3159,7 @@ static int _nfs4_do_open(struct inode *dir,
status = _nfs4_open_and_get_state(opendata, flags, ctx); status = _nfs4_open_and_get_state(opendata, flags, ctx);
if (status != 0) if (status != 0)
goto err_free_label; goto err_opendata_put;
state = ctx->state; state = ctx->state;
if ((opendata->o_arg.open_flags & (O_CREAT|O_EXCL)) == (O_CREAT|O_EXCL) && if ((opendata->o_arg.open_flags & (O_CREAT|O_EXCL)) == (O_CREAT|O_EXCL) &&
@ -3186,11 +3176,12 @@ static int _nfs4_do_open(struct inode *dir,
nfs_fattr_init(opendata->o_res.f_attr); nfs_fattr_init(opendata->o_res.f_attr);
status = nfs4_do_setattr(state->inode, cred, status = nfs4_do_setattr(state->inode, cred,
opendata->o_res.f_attr, sattr, opendata->o_res.f_attr, sattr,
ctx, label, olabel); ctx, label, opendata->o_res.f_attr->label);
if (status == 0) { if (status == 0) {
nfs_setattr_update_inode(state->inode, sattr, nfs_setattr_update_inode(state->inode, sattr,
opendata->o_res.f_attr); opendata->o_res.f_attr);
nfs_setsecurity(state->inode, opendata->o_res.f_attr, olabel); nfs_setsecurity(state->inode, opendata->o_res.f_attr,
opendata->o_res.f_attr->label);
} }
sattr->ia_valid = ia_old; sattr->ia_valid = ia_old;
} }
@ -3203,13 +3194,9 @@ static int _nfs4_do_open(struct inode *dir,
opendata->f_attr.mdsthreshold = NULL; opendata->f_attr.mdsthreshold = NULL;
} }
nfs4_label_free(olabel);
nfs4_opendata_put(opendata); nfs4_opendata_put(opendata);
nfs4_put_state_owner(sp); nfs4_put_state_owner(sp);
return 0; return 0;
err_free_label:
nfs4_label_free(olabel);
err_opendata_put: err_opendata_put:
nfs4_opendata_put(opendata); nfs4_opendata_put(opendata);
err_put_state_owner: err_put_state_owner:

2
fs/nfs/nfs4xdr.c
View File

@ -6524,7 +6524,7 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
goto out; goto out;
if (res->access_request) if (res->access_request)
decode_access(xdr, &res->access_supported, &res->access_result); decode_access(xdr, &res->access_supported, &res->access_result);
decode_getfattr_label(xdr, res->f_attr, res->f_label, res->server); decode_getfattr_label(xdr, res->f_attr, res->f_attr->label, res->server);
if (res->lg_res) if (res->lg_res)
decode_layoutget(xdr, rqstp, res->lg_res); decode_layoutget(xdr, rqstp, res->lg_res);
out: out:

1
include/linux/nfs_xdr.h
View File

@ -488,7 +488,6 @@ struct nfs_openres {
struct nfs4_change_info cinfo; struct nfs4_change_info cinfo;
__u32 rflags; __u32 rflags;
struct nfs_fattr * f_attr; struct nfs_fattr * f_attr;
struct nfs4_label *f_label;
struct nfs_seqid * seqid; struct nfs_seqid * seqid;
const struct nfs_server *server; const struct nfs_server *server;
fmode_t delegation_type; fmode_t delegation_type;