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

Commit cd94f231 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: Add spaces preferred around that '{+, -, *, /, |, <<, >>, &}' 



This patch fixes all checkpatch occurences of
"CHECK: spaces preferred around that '{+,-,*,/,|,<<,>>,&}' (ctx:VxV)"
in Lustre code.

Signed-off-by: default avatarEmoly Liu <emoly.liu@intel.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 10adcce6

drivers/staging/lustre/lustre/include/lu_object.h

+2 −1
Original line number Diff line number Diff line
@@ -1024,7 +1024,8 @@ enum lu_context_tag { 
	/**

	 * Contexts usable in cache shrinker thread.

	 */

	LCT_SHRINKER  = LCT_MD_THREAD|LCT_DT_THREAD|LCT_CL_THREAD|LCT_NOREF

	LCT_SHRINKER  = LCT_MD_THREAD | LCT_DT_THREAD | LCT_CL_THREAD |

			LCT_NOREF

};



/**

drivers/staging/lustre/lustre/include/obd_support.h

+7 −6
Original line number Diff line number Diff line
@@ -527,6 +527,7 @@ do { \ 
} while (0)



#define KEY_IS(str)					\

	(keylen >= (sizeof(str)-1) && memcmp(key, str, (sizeof(str)-1)) == 0)

	(keylen >= (sizeof(str) - 1) &&			\

	memcmp(key, str, (sizeof(str) - 1)) == 0)



#endif

drivers/staging/lustre/lustre/llite/llite_lib.c

+12 −9
Original line number Diff line number Diff line
@@ -659,7 +659,8 @@ static int ll_options(char *options, int *flags) 
			*flags |= tmp;

			goto next;

		}

		tmp = ll_set_opt("noflock", s1, LL_SBI_FLOCK|LL_SBI_LOCALFLOCK);

		tmp = ll_set_opt("noflock", s1,

				 LL_SBI_FLOCK | LL_SBI_LOCALFLOCK);

		if (tmp) {

			*flags &= ~tmp;

			goto next;
@@ -1742,9 +1743,11 @@ int ll_update_inode(struct inode *inode, struct lustre_md *md) 
		lli->lli_ctime = body->mbo_ctime;

	}

	if (body->mbo_valid & OBD_MD_FLMODE)

		inode->i_mode = (inode->i_mode & S_IFMT)|(body->mbo_mode & ~S_IFMT);

		inode->i_mode = (inode->i_mode & S_IFMT) |

				(body->mbo_mode & ~S_IFMT);

	if (body->mbo_valid & OBD_MD_FLTYPE)

		inode->i_mode = (inode->i_mode & ~S_IFMT)|(body->mbo_mode & S_IFMT);

		inode->i_mode = (inode->i_mode & ~S_IFMT) |

				(body->mbo_mode & S_IFMT);

	LASSERT(inode->i_mode != 0);

	if (S_ISREG(inode->i_mode))

		inode->i_blkbits = min(PTLRPC_MAX_BRW_BITS + 1,

drivers/staging/lustre/lustre/llite/rw.c

+3 −2
Original line number Diff line number Diff line
@@ -651,7 +651,8 @@ static void ras_update_stride_detector(struct ll_readahead_state *ras, 
	if (!stride_io_mode(ras) && (stride_gap != 0 ||

	    ras->ras_consecutive_stride_requests == 0)) {

		ras->ras_stride_pages = ras->ras_consecutive_pages;

		ras->ras_stride_length = stride_gap+ras->ras_consecutive_pages;

		ras->ras_stride_length = ras->ras_consecutive_pages +

					 stride_gap;

	}

	LASSERT(ras->ras_request_index == 0);

	LASSERT(ras->ras_consecutive_stride_requests == 0);

drivers/staging/lustre/lustre/llite/super25.c

+2 −2
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ static int __init lustre_init(void) 


	rc = -ENOMEM;

	ll_inode_cachep = kmem_cache_create("lustre_inode_cache",

					    sizeof(struct ll_inode_info),

					    0, SLAB_HWCACHE_ALIGN|SLAB_ACCOUNT,

					    sizeof(struct ll_inode_info), 0,

					    SLAB_HWCACHE_ALIGN | SLAB_ACCOUNT,

					    NULL);

	if (!ll_inode_cachep)

		goto out_cache;