[PATCH] staging: lustre: remove unused variable

[PATCH] staging: lustre: remove unused variable

[Sudip Mukherjee]

there variables were not used anywhere and was showing as build warning.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/staging/lustre/lustre/lov/lov_request.c | 4 +---
 drivers/staging/lustre/lustre/obdclass/acl.c    | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/lov/lov_request.c b/drivers/staging/lustre/lustre/lov/lov_request.c
index f6e1314..d24ba8e 100644
--- a/drivers/staging/lustre/lustre/lov/lov_request.c
+++ b/drivers/staging/lustre/lustre/lov/lov_request.c
@@ -74,10 +74,8 @@ void lov_finish_set(struct lov_request_set *set)
 		kfree(req);
 	}
 
-	if (set->set_pga) {
-		int len = set->set_oabufs * sizeof(*set->set_pga);
+	if (set->set_pga)
 		OBD_FREE_LARGE(set->set_pga, len);
-	}
 	if (set->set_lockh)
 		lov_llh_put(set->set_lockh);
 
diff --git a/drivers/staging/lustre/lustre/obdclass/acl.c b/drivers/staging/lustre/lustre/obdclass/acl.c
index 194c48a..bc3fc47 100644
--- a/drivers/staging/lustre/lustre/obdclass/acl.c
+++ b/drivers/staging/lustre/lustre/obdclass/acl.c
@@ -120,7 +120,6 @@ static int lustre_ext_acl_xattr_reduce_space(ext_acl_xattr_header **header,
 {
 	int ext_count = le32_to_cpu((*header)->a_count);
 	int ext_size = CFS_ACL_XATTR_SIZE(ext_count, ext_acl_xattr);
-	int old_size = CFS_ACL_XATTR_SIZE(old_count, ext_acl_xattr);
 	ext_acl_xattr_header *new;
 
 	if (unlikely(old_count <= ext_count))
-- 
1.8.1.2

Re: [PATCH] staging: lustre: remove unused variable

[Dan Carpenter]

On Mon, May 11, 2015 at 04:17:10PM +0530, Sudip Mukherjee wrote:
> there variables were not used anywhere and was showing as build warning.
> 
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> ---
>  drivers/staging/lustre/lustre/lov/lov_request.c | 4 +---
>  drivers/staging/lustre/lustre/obdclass/acl.c    | 1 -
>  2 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/lustre/lustre/lov/lov_request.c b/drivers/staging/lustre/lustre/lov/lov_request.c
> index f6e1314..d24ba8e 100644
> --- a/drivers/staging/lustre/lustre/lov/lov_request.c
> +++ b/drivers/staging/lustre/lustre/lov/lov_request.c
> @@ -74,10 +74,8 @@ void lov_finish_set(struct lov_request_set *set)
>  		kfree(req);
>  	}
>  
> -	if (set->set_pga) {
> -		int len = set->set_oabufs * sizeof(*set->set_pga);
> +	if (set->set_pga)
>  		OBD_FREE_LARGE(set->set_pga, len);
                                             ^^^
It's used right here?

regards,
dan carpenter

Re: [PATCH] staging: lustre: remove unused variable

[Sudip Mukherjee]

On Mon, May 11, 2015 at 02:31:02PM +0300, Dan Carpenter wrote:
> On Mon, May 11, 2015 at 04:17:10PM +0530, Sudip Mukherjee wrote:
> > -	if (set->set_pga) {
> > -		int len = set->set_oabufs * sizeof(*set->set_pga);
> > +	if (set->set_pga)
> >  		OBD_FREE_LARGE(set->set_pga, len);
>                                              ^^^
> It's used right here?

oops.. sorry .. but why i didnot get a build failure after this?

ok, got it ...  

#define OBD_FREE_LARGE(ptr, size)	\
do {					\
		kvfree(ptr);		\
} while (0)

the variable is actually not used. I will make a v2 and send 
tomorrow. today is a day of silly mistakes :( 

regards
sudip

> 
> regards,
> dan carpenter
> 

Re: [PATCH] staging: lustre: remove unused variable

[Drokin, Oleg]

Hello!
On May 11, 2015, at 7:43 AM, Sudip Mukherjee wrote:

> On Mon, May 11, 2015 at 02:31:02PM +0300, Dan Carpenter wrote:
>> On Mon, May 11, 2015 at 04:17:10PM +0530, Sudip Mukherjee wrote:
>>> -	if (set->set_pga) {
>>> -		int len = set->set_oabufs * sizeof(*set->set_pga);
>>> +	if (set->set_pga)
>>> 		OBD_FREE_LARGE(set->set_pga, len);
>>                                             ^^^
>> It's used right here?
> 
> oops.. sorry .. but why i didnot get a build failure after this?
> 
> ok, got it ...  
> 
> #define OBD_FREE_LARGE(ptr, size)	\
> do {					\
> 		kvfree(ptr);		\
> } while (0)
> 
> the variable is actually not used. I will make a v2 and send 
> tomorrow. today is a day of silly mistakes :( 

It's probably best to wait for a bit at this point.

Julia is going to send in a bunch of patches actually getting rid of
those macros.
And then whatever stuff surfaces would be easier to see.

Thanks!

Bye,
    Oleg

Re: [patch] staging: lustre: remove unused variable

[Greg Kroah-Hartman]

On Tue, Nov 03, 2015 at 10:38:15PM +0000, Simmons, James A. wrote:
> 
> >The "->lr_lvb_data" struct member is never used.  Delete it.
> >
> >Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> >---
> >I have compile tested this.  I looked through the history and it seems
> >to never have been used.  I wonder if we can remove the locking as well.
> 
> This is used by the quota and ofd layer which are both server side. 

What does that mean here?

confused,

greg k-h

RE: [patch] staging: lustre: remove unused variable

[Simmons, James A.]

>The "->lr_lvb_data" struct member is never used.  Delete it.
>
>Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>---
>I have compile tested this.  I looked through the history and it seems
>to never have been used.  I wonder if we can remove the locking as well.

This is used by the quota and ofd layer which are both server side. 

[patch] staging: lustre: remove unused variable

[Dan Carpenter]

The "->lr_lvb_data" struct member is never used.  Delete it.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
I have compile tested this.  I looked through the history and it seems
to never have been used.  I wonder if we can remove the locking as well.

diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index 0e75a15..138479a 100644
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -872,8 +872,6 @@ struct ldlm_resource {
 	 */
 	struct mutex		lr_lvb_mutex;
 	int			lr_lvb_len;
-	/** protected by lr_lock */
-	void			*lr_lvb_data;
 
 	/** When the resource was considered as contended. */
 	unsigned long		lr_contention_time;
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
index c0a54bf..b55a4f0 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
@@ -1154,8 +1154,6 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent,
 			CERROR("%s: lvbo_init failed for resource %#llx:%#llx: rc = %d\n",
 			       ns->ns_obd->obd_name, name->name[0],
 			       name->name[1], rc);
-			kfree(res->lr_lvb_data);
-			res->lr_lvb_data = NULL;
 			res->lr_lvb_len = rc;
 			mutex_unlock(&res->lr_lvb_mutex);
 			ldlm_resource_putref(res);