staging: lustre: remove unused variable

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

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index 0e75a15fe0d42f5f1d44cbb3ea82ef9fdab40fac..138479a9edc1fe781818dac61d52307ed11d9f55 100644 (file)
--- 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 c0a54bf406ca58b0dac23ac20e24ca6395822bfe..b55a4f0eb1d5aa564bdcbde7bcb4cec09b0dd10e 100644 (file)
--- 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);