Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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/10451


Reviewed-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

drivers/staging/lustre/lustre/include/obd.h

+5 −5
Original line number Diff line number Diff line
@@ -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"

drivers/staging/lustre/lustre/obdecho/echo_client.c

+3 −3
Original line number Diff line number Diff line
@@ -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 ||