list_for_each_entry_safe(jobid, n, jobid_list, tj_linkage) {
OBD_FREE(jobid->tj_id, strlen(jobid->tj_id) + 1);
list_del(&jobid->tj_linkage);
- OBD_FREE(jobid, sizeof(struct nrs_tbf_jobid));
+ OBD_FREE_PTR(jobid);
}
}
struct nrs_tbf_jobid *jobid;
char *ptr;
- OBD_ALLOC(jobid, sizeof(struct nrs_tbf_jobid));
+ OBD_ALLOC_PTR(jobid);
if (jobid == NULL)
return -ENOMEM;
OBD_ALLOC(jobid->tj_id, id->ls_len + 1);
if (jobid->tj_id == NULL) {
- OBD_FREE(jobid, sizeof(struct nrs_tbf_jobid));
+ OBD_FREE_PTR(jobid);
return -ENOMEM;
}
return &RQF_LDLM_INTENT_OPEN;
else if (it_opc & (IT_GETATTR | IT_LOOKUP))
return &RQF_LDLM_INTENT_GETATTR;
- else if (it_opc & IT_UNLINK)
- return &RQF_LDLM_INTENT_UNLINK;
else if (it_opc & IT_GETXATTR)
return &RQF_LDLM_INTENT_GETXATTR;
else if (it_opc & (IT_GLIMPSE | IT_BRW))
struct cfs_lstr field;
int rc = 0;
- OBD_ALLOC(expr, sizeof(struct nrs_tbf_expression));
+ OBD_ALLOC_PTR(expr);
if (expr == NULL)
return -ENOMEM;
struct cfs_lstr expr;
int rc = 0;
- OBD_ALLOC(conjunction, sizeof(struct nrs_tbf_conjunction));
+ OBD_ALLOC_PTR(conjunction);
if (conjunction == NULL)
return -ENOMEM;
return type;
}
-extern struct nrs_core nrs_core;
#define LPROCFS_WR_NRS_TBF_MAX_CMD (4096)
static ssize_t
ptlrpc_lprocfs_nrs_tbf_rule_seq_write(struct file *file,
{ NULL }
};
- if (IS_ERR_OR_NULL(svc->srv_debugfs_entry))
+ if (!svc->srv_debugfs_entry)
return 0;
return ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_tbf_lprocfs_vars,