LU-8590 utils: remove duplicate code in lgss_sk

[fs/lustre-release.git] / lustre / utils / req-layout.c

diff --git a/lustre/utils/req-layout.c b/lustre/utils/req-layout.c
index 6668fd4..49ec251 100644 (file)
--- a/lustre/utils/req-layout.c
+++ b/lustre/utils/req-layout.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -49,12 +45,16 @@
 
 #include <linux/types.h>
 
-#define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
 #define __REQ_LAYOUT_USER__ (1)
 #define EXPORT_SYMBOL(s)
 
 #include <lustre/lustre_idl.h>
 #include <lustre_req_layout.h>
+#include <lustre/lustreapi.h>
+
+#ifndef ARRAY_SIZE
+# define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
+#endif /* !ARRAY_SIZE */
 
 #define lustre_swab_generic_32s NULL
 #define lustre_swab_lu_seq_range NULL
@@ -114,6 +114,8 @@
 #define lustre_swab_lmv_user_md NULL
 #define lustre_swab_lfsck_request NULL
 #define lustre_swab_lfsck_reply NULL
+#define lustre_swab_ladvise_hdr NULL
+#define lustre_swab_ladvise NULL
 
 /*
  * Yes, include .c file.