Commit 485154db authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman

staging: lustre: obd: add lnb_ prefix to members of struct niobuf_local

Add the prefix lnb_ to the members of struct niobuf_local that do not
already have it. Change the struct dentry *lnb_dentry member to void
*lnb_data as it is not used to hold a pointer to struct dentry.
Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5061
Reviewed-on: http://review.whamcloud.com/10451Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarMike Pershin <mike.pershin@intel.com>
Reviewed-by: default avatarAlex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent feefbe04
...@@ -437,11 +437,11 @@ struct lmv_obd { ...@@ -437,11 +437,11 @@ struct lmv_obd {
struct niobuf_local { struct niobuf_local {
__u64 lnb_file_offset; __u64 lnb_file_offset;
__u32 lnb_page_offset; __u32 lnb_page_offset;
__u32 len; __u32 lnb_len;
__u32 flags; __u32 lnb_flags;
struct page *page; struct page *lnb_page;
struct dentry *dentry; void *lnb_data;
int rc; int lnb_rc;
}; };
#define LUSTRE_FLD_NAME "fld" #define LUSTRE_FLD_NAME "fld"
......
...@@ -1452,14 +1452,14 @@ static int echo_client_prep_commit(const struct lu_env *env, ...@@ -1452,14 +1452,14 @@ static int echo_client_prep_commit(const struct lu_env *env,
LASSERT(lpages == npages); LASSERT(lpages == npages);
for (i = 0; i < lpages; i++) { for (i = 0; i < lpages; i++) {
struct page *page = lnb[i].page; struct page *page = lnb[i].lnb_page;
/* read past eof? */ /* read past eof? */
if (!page && lnb[i].rc == 0) if (!page && lnb[i].lnb_rc == 0)
continue; continue;
if (async) if (async)
lnb[i].flags |= OBD_BRW_ASYNC; lnb[i].lnb_flags |= OBD_BRW_ASYNC;
if (ostid_id(&oa->o_oi) == ECHO_PERSISTENT_OBJID || if (ostid_id(&oa->o_oi) == ECHO_PERSISTENT_OBJID ||
(oa->o_valid & OBD_MD_FLFLAGS) == 0 || (oa->o_valid & OBD_MD_FLFLAGS) == 0 ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment