staging/lustre: remove unused lustre_update.h header

lustre_update.h containts various server-side structures that are
not really relevant for the client.
Also remove the only user of this file that does not actually need it.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/lustre_update.h b/drivers/staging/lustre/lustre/include/lustre_update.h
deleted file mode 100644 (file)
index 84defce..0000000
--- a/drivers/staging/lustre/lustre/include/lustre_update.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 only,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
- * http://www.gnu.org/licenses/gpl-2.0.htm
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 2013, Intel Corporation.
- */
-/*
- * lustre/include/lustre_update.h
- *
- * Author: Di Wang <di.wang@intel.com>
- */
-
-#ifndef _LUSTRE_UPDATE_H
-#define _LUSTRE_UPDATE_H
-
-#define UPDATE_BUFFER_SIZE     8192
-struct update_request {
-       struct dt_device        *ur_dt;
-       struct list_head                ur_list;    /* attached itself to thandle */
-       int                     ur_flags;
-       int                     ur_rc;      /* request result */
-       int                     ur_batchid; /* Current batch(trans) id */
-       struct update_buf       *ur_buf;   /* Holding the update req */
-};
-
-static inline unsigned long update_size(struct update *update)
-{
-       unsigned long size;
-       int        i;
-
-       size = cfs_size_round(offsetof(struct update, u_bufs[0]));
-       for (i = 0; i < UPDATE_BUF_COUNT; i++)
-               size += cfs_size_round(update->u_lens[i]);
-
-       return size;
-}
-
-static inline void *update_param_buf(struct update *update, int index,
-                                    int *size)
-{
-       int     i;
-       void    *ptr;
-
-       if (index >= UPDATE_BUF_COUNT)
-               return NULL;
-
-       ptr = (char *)update + cfs_size_round(offsetof(struct update,
-                                                      u_bufs[0]));
-       for (i = 0; i < index; i++) {
-               LASSERT(update->u_lens[i] > 0);
-               ptr += cfs_size_round(update->u_lens[i]);
-       }
-
-       if (size != NULL)
-               *size = update->u_lens[index];
-
-       return ptr;
-}
-
-static inline unsigned long update_buf_size(struct update_buf *buf)
-{
-       unsigned long size;
-       int        i = 0;
-
-       size = cfs_size_round(offsetof(struct update_buf, ub_bufs[0]));
-       for (i = 0; i < buf->ub_count; i++) {
-               struct update *update;
-
-               update = (struct update *)((char *)buf + size);
-               size += update_size(update);
-       }
-       LASSERT(size <= UPDATE_BUFFER_SIZE);
-       return size;
-}
-
-static inline void *update_buf_get(struct update_buf *buf, int index, int *size)
-{
-       int     count = buf->ub_count;
-       void    *ptr;
-       int     i = 0;
-
-       if (index >= count)
-               return NULL;
-
-       ptr = (char *)buf + cfs_size_round(offsetof(struct update_buf,
-                                                   ub_bufs[0]));
-       for (i = 0; i < index; i++)
-               ptr += update_size((struct update *)ptr);
-
-       if (size != NULL)
-               *size = update_size((struct update *)ptr);
-
-       return ptr;
-}
-
-static inline void update_init_reply_buf(struct update_reply *reply, int count)
-{
-       reply->ur_version = UPDATE_REPLY_V1;
-       reply->ur_count = count;
-}
-
-static inline void *update_get_buf_internal(struct update_reply *reply,
-                                           int index, int *size)
-{
-       char *ptr;
-       int count = reply->ur_count;
-       int i;
-
-       if (index >= count)
-               return NULL;
-
-       ptr = (char *)reply + cfs_size_round(offsetof(struct update_reply,
-                                            ur_lens[count]));
-       for (i = 0; i < index; i++) {
-               LASSERT(reply->ur_lens[i] > 0);
-               ptr += cfs_size_round(reply->ur_lens[i]);
-       }
-
-       if (size != NULL)
-               *size = reply->ur_lens[index];
-
-       return ptr;
-}
-
-static inline void update_insert_reply(struct update_reply *reply, void *data,
-                                      int data_len, int index, int rc)
-{
-       char *ptr;
-
-       ptr = update_get_buf_internal(reply, index, NULL);
-       LASSERT(ptr != NULL);
-
-       *(int *)ptr = cpu_to_le32(rc);
-       ptr += sizeof(int);
-       if (data_len > 0) {
-               LASSERT(data != NULL);
-               memcpy(ptr, data, data_len);
-       }
-       reply->ur_lens[index] = data_len + sizeof(int);
-}
-
-static inline int update_get_reply_buf(struct update_reply *reply, void **buf,
-                                      int index)
-{
-       char *ptr;
-       int  size = 0;
-       int  result;
-
-       ptr = update_get_buf_internal(reply, index, &size);
-       result = *(int *)ptr;
-
-       if (result < 0)
-               return result;
-
-       LASSERT((ptr != NULL && size >= sizeof(int)));
-       *buf = ptr + sizeof(int);
-       return size - sizeof(int);
-}
-
-static inline int update_get_reply_result(struct update_reply *reply,
-                                         void **buf, int index)
-{
-       void *ptr;
-       int  size;
-
-       ptr = update_get_buf_internal(reply, index, &size);
-       LASSERT(ptr != NULL && size > sizeof(int));
-       return *(int *)ptr;
-}
-
-#endif

diff --git a/drivers/staging/lustre/lustre/ptlrpc/layout.c b/drivers/staging/lustre/lustre/ptlrpc/layout.c
index dc5ceb55d001c7763ff0eb75f5d1d8f22059b20e..bbef666b1d167b1f3dfce82e38490faa6304ea11 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/layout.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/layout.c
@@ -65,7 +65,6 @@
 #endif
 /* struct ptlrpc_request, lustre_msg* */
 #include "../include/lustre_req_layout.h"
-#include "../include/lustre_update.h"
 #include "../include/lustre_acl.h"
 #include "../include/lustre_debug.h"