renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-02 10:43:57 +08:00
Code

staging: lustre: llite: remove unused parameters from md_{get, set}xattr()

Browse Source 
md_getxattr() and md_setxattr() each have several unused
parameters. Remove them and improve the naming or remaining
parameters.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-10792
Reviewed-on: https://review.whamcloud.com/
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
John L. Hammond 2018-05-29 10:21:42 -04:00 committed by Greg Kroah-Hartman
parent bf3d126206
commit a694be449a
7 changed files with 45 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/lustre/lustre/include/obd.h
View File

@ -940,12 +940,11 @@ struct md_ops {
struct ptlrpc_request **);
int (*setxattr)(struct obd_export *, const struct lu_fid *,
u64, const char *, const char *, int, int, int, __u32,
struct ptlrpc_request **);
u64, const char *, const void *, size_t, unsigned int,
u32, struct ptlrpc_request **);
int (*getxattr)(struct obd_export *, const struct lu_fid *,
u64, const char *, const char *, int, int, int,
struct ptlrpc_request **);
u64, const char *, size_t, struct ptlrpc_request **);
int (*init_ea_size)(struct obd_export *, u32, u32);

21
drivers/staging/lustre/lustre/include/obd_class.h
View File

@ -1385,29 +1385,26 @@ static inline int md_merge_attr(struct obd_export *exp,
}
static inline int md_setxattr(struct obd_export *exp, const struct lu_fid *fid,
u64 valid, const char *name,
const char *input, int input_size,
int output_size, int flags, __u32 suppgid,
u64 obd_md_valid, const char *name,
const char *value, size_t value_size,
unsigned int xattr_flags, u32 suppgid,
struct ptlrpc_request **request)
{
EXP_CHECK_MD_OP(exp, setxattr);
EXP_MD_COUNTER_INCREMENT(exp, setxattr);
return MDP(exp->exp_obd, setxattr)(exp, fid, valid, name, input,
input_size, output_size, flags,
return MDP(exp->exp_obd, setxattr)(exp, fid, obd_md_valid, name,
value, value_size, xattr_flags,
suppgid, request);
}
static inline int md_getxattr(struct obd_export *exp, const struct lu_fid *fid,
u64 valid, const char *name,
const char *input, int input_size,
int output_size, int flags,
struct ptlrpc_request **request)
u64 obd_md_valid, const char *name,
size_t buf_size, struct ptlrpc_request **req)
{
EXP_CHECK_MD_OP(exp, getxattr);
EXP_MD_COUNTER_INCREMENT(exp, getxattr);
return MDP(exp->exp_obd, getxattr)(exp, fid, valid, name, input,
input_size, output_size, flags,
request);
return MDP(exp->exp_obd, getxattr)(exp, fid, obd_md_valid, name,
buf_size, req);
}
static inline int md_set_open_replay_data(struct obd_export *exp,

2
drivers/staging/lustre/lustre/llite/acl.c
View File

@ -94,7 +94,7 @@ int ll_set_acl(struct inode *inode, struct posix_acl *acl, int type)
rc = md_setxattr(sbi->ll_md_exp, ll_inode2fid(inode),
value ? OBD_MD_FLXATTR : OBD_MD_FLXATTRRM,
name, value, value_size, 0, 0, 0, &req);
name, value, value_size, 0, 0, &req);
ptlrpc_req_finished(req);
out_value:

3
drivers/staging/lustre/lustre/llite/file.c
View File

@ -3323,8 +3323,7 @@ static int ll_layout_fetch(struct inode *inode, struct ldlm_lock *lock)
rc = ll_get_default_mdsize(sbi, &lmmsize);
if (rc == 0)
rc = md_getxattr(sbi->ll_md_exp, ll_inode2fid(inode),
OBD_MD_FLXATTR, XATTR_NAME_LOV, NULL, 0,
lmmsize, 0, &req);
OBD_MD_FLXATTR, XATTR_NAME_LOV, lmmsize, &req);
if (rc < 0)
return rc;

6
drivers/staging/lustre/lustre/llite/xattr.c
View File

@ -145,7 +145,7 @@ static int ll_xattr_set_common(const struct xattr_handler *handler,
return -ENOMEM;
rc = md_setxattr(sbi->ll_md_exp, ll_inode2fid(inode), valid, fullname,
pv, size, 0, flags, ll_i2suppgid(inode), &req);
pv, size, flags, ll_i2suppgid(inode), &req);
kfree(fullname);
if (rc) {
if (rc == -EOPNOTSUPP && handler->flags == XATTR_USER_T) {
@ -344,8 +344,8 @@ int ll_xattr_list(struct inode *inode, const char *name, int type, void *buffer,
}
} else {
getxattr_nocache:
rc = md_getxattr(sbi->ll_md_exp, ll_inode2fid(inode),
valid, name, NULL, 0, size, 0, &req);
rc = md_getxattr(sbi->ll_md_exp, ll_inode2fid(inode), valid,
name, size, &req);
if (rc < 0)
goto out_xattr;

22
drivers/staging/lustre/lustre/lmv/lmv_obd.c
View File

@ -1400,9 +1400,8 @@ static int lmv_getstatus(struct obd_export *exp,
}
static int lmv_getxattr(struct obd_export *exp, const struct lu_fid *fid,
u64 valid, const char *name,
const char *input, int input_size, int output_size,
int flags, struct ptlrpc_request **request)
u64 obd_md_valid, const char *name, size_t buf_size,
struct ptlrpc_request **req)
{
struct obd_device *obd = exp->exp_obd;
struct lmv_obd *lmv = &obd->u.lmv;
@ -1412,15 +1411,15 @@ static int lmv_getxattr(struct obd_export *exp, const struct lu_fid *fid,
if (IS_ERR(tgt))
return PTR_ERR(tgt);
return md_getxattr(tgt->ltd_exp, fid, valid, name, input,
input_size, output_size, flags, request);
return md_getxattr(tgt->ltd_exp, fid, obd_md_valid, name, buf_size,
req);
}
static int lmv_setxattr(struct obd_export *exp, const struct lu_fid *fid,
u64 valid, const char *name,
const char *input, int input_size, int output_size,
int flags, __u32 suppgid,
struct ptlrpc_request **request)
u64 obd_md_valid, const char *name,
const void *value, size_t value_size,
unsigned int xattr_flags, u32 suppgid,
struct ptlrpc_request **req)
{
struct obd_device *obd = exp->exp_obd;
struct lmv_obd *lmv = &obd->u.lmv;
@ -1430,9 +1429,8 @@ static int lmv_setxattr(struct obd_export *exp, const struct lu_fid *fid,
if (IS_ERR(tgt))
return PTR_ERR(tgt);
return md_setxattr(tgt->ltd_exp, fid, valid, name, input,
input_size, output_size, flags, suppgid,
request);
return md_setxattr(tgt->ltd_exp, fid, obd_md_valid, name,
value, value_size, xattr_flags, suppgid, req);
}
static int lmv_getattr(struct obd_export *exp, struct md_op_data *op_data,

32
drivers/staging/lustre/lustre/mdc/mdc_request.c
View File

@ -350,26 +350,30 @@ static int mdc_xattr_common(struct obd_export *exp,
}
static int mdc_setxattr(struct obd_export *exp, const struct lu_fid *fid,
u64 valid, const char *xattr_name,
const char *input, int input_size, int output_size,
int flags, __u32 suppgid,
struct ptlrpc_request **request)
u64 obd_md_valid, const char *name,
const void *value, size_t value_size,
unsigned int xattr_flags, u32 suppgid,
struct ptlrpc_request **req)
{
LASSERT(obd_md_valid == OBD_MD_FLXATTR ||
obd_md_valid == OBD_MD_FLXATTRRM);
return mdc_xattr_common(exp, &RQF_MDS_REINT_SETXATTR,
fid, MDS_REINT, valid, xattr_name,
input, input_size, output_size, flags,
suppgid, request);
fid, MDS_REINT, obd_md_valid, name,
value, value_size, 0, xattr_flags, suppgid,
req);
}
static int mdc_getxattr(struct obd_export *exp, const struct lu_fid *fid,
u64 valid, const char *xattr_name,
const char *input, int input_size, int output_size,
int flags, struct ptlrpc_request **request)
u64 obd_md_valid, const char *name, size_t buf_size,
struct ptlrpc_request **req)
{
return mdc_xattr_common(exp, &RQF_MDS_GETXATTR,
fid, MDS_GETXATTR, valid, xattr_name,
input, input_size, output_size, flags,
-1, request);
LASSERT(obd_md_valid == OBD_MD_FLXATTR ||
obd_md_valid == OBD_MD_FLXATTRLS);
return mdc_xattr_common(exp, &RQF_MDS_GETXATTR, fid, MDS_GETXATTR,
obd_md_valid, name, NULL, 0, buf_size, 0, -1,
req);
}
#ifdef CONFIG_FS_POSIX_ACL