Re: [PATCH v3 7/7] staging: lustre: lclient: lcommon_cl.c fixing coding style issues

[Drokin, Oleg]

On Jun 16, 2014, at 12:28 AM, Anil Belur wrote:

> From: Anil Belur <askb23@xxxxxxxxx>
> 
> fixed: WARNING: line over 80 characters and indent after the conditional
> statement
> 
> Signed-off-by: Anil Belur <askb23@xxxxxxxxx>
> ---
> drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
> index c180a20..8fed70c 100644
> --- a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
> +++ b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
> @@ -825,6 +825,7 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,
> 	loff_t	  pos   = start + count - 1;
> 	loff_t kms;
> 	int result;
> +	unsigned long cur_index;

I wonder why move this particular declaration here?
The only user is still in that one conditional branch anyway.

> 
> 	/*
> 	 * Consistency guarantees: following possibilities exist for the
> @@ -864,11 +865,13 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,
> 				 * linux-2.6.18-128.1.1 miss to do that.
> 				 * --bug 17336 */
> 				loff_t size = cl_isize_read(inode);
> -				unsigned long cur_index = start >> PAGE_CACHE_SHIFT;
> +
> +				cur_index = start >> PAGE_CACHE_SHIFT;
> +				loff_t check = ((size - 1) >> PAGE_CACHE_SHIFT);

This used to produce a warning about mixing code and declarations in the past. 
Probably a bad idea to mix them anyway.

Thanks.

Bye,
    Oleg

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/