mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 05:31:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: John L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5061
Reviewed-on: http://review.whamcloud.com/10451
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Mike Pershin <mike.pershin@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.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
2016-09-18 16:37:06 -04:00
committed by Greg Kroah-Hartman
parent feefbe04ff
commit 485154db5e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,11 +437,11 @@ struct lmv_obd {
struct niobuf_local {
__u64 lnb_file_offset;
__u32 lnb_page_offset;
__u32 len;
__u32 flags;
struct page *page;
struct dentry *dentry;
int rc;
__u32 lnb_len;
__u32 lnb_flags;
struct page *lnb_page;
void *lnb_data;
int lnb_rc;
};
#define LUSTRE_FLD_NAME "fld"

6
drivers/staging/lustre/lustre/obdecho/echo_client.c
View File

@@ -1452,14 +1452,14 @@ static int echo_client_prep_commit(const struct lu_env *env,
LASSERT(lpages == npages);
for (i = 0; i < lpages; i++) {
struct page *page = lnb[i].page;
struct page *page = lnb[i].lnb_page;
/* read past eof? */
if (!page && lnb[i].rc == 0)
if (!page && lnb[i].lnb_rc == 0)
continue;
if (async)
lnb[i].flags |= OBD_BRW_ASYNC;
lnb[i].lnb_flags |= OBD_BRW_ASYNC;
if (ostid_id(&oa->o_oi) == ECHO_PERSISTENT_OBJID ||
(oa->o_valid & OBD_MD_FLFLAGS) == 0 ||