[PATCH 7/9] staging/lustre: remove libcfs/linux/linux-utils.c

Peng Tao bergwolf at gmail.com
Mon Jun 3 13:58:20 UTC 2013


It is not used any more.

Signed-off-by: Peng Tao <tao.peng at emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger at intel.com>
---
 .../staging/lustre/include/linux/libcfs/libcfs.h   |   23 ------
 .../lustre/include/linux/libcfs/linux/libcfs.h     |    6 --
 drivers/staging/lustre/lustre/libcfs/Makefile      |    2 +-
 .../lustre/lustre/libcfs/linux/linux-utils.c       |   75 --------------------
 4 files changed, 1 insertion(+), 105 deletions(-)
 delete mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-utils.c

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
index 7673aa5..1ab1f2b 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
@@ -190,29 +190,6 @@ void cfs_restore_sigs(sigset_t);
 int cfs_signal_pending(void);
 void cfs_clear_sigpending(void);
 
-int convert_server_error(__u64 ecode);
-int convert_client_oflag(int cflag, int *result);
-
-/*
- * Stack-tracing filling.
- */
-
-/*
- * Platform-dependent data-type to hold stack frames.
- */
-struct cfs_stack_trace;
-
-/*
- * Fill @trace with current back-trace.
- */
-void cfs_stack_trace_fill(struct cfs_stack_trace *trace);
-
-/*
- * Return instruction pointer for frame @frame_no. NULL if @frame_no is
- * invalid.
- */
-void *cfs_stack_trace_frame(struct cfs_stack_trace *trace, int frame_no);
-
 /*
  * Random number handling
  */
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
index 757e6dc..292a3ba 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
@@ -111,12 +111,6 @@ do {								    \
 
 #include <linux/capability.h>
 
-/*
- * No stack-back-tracing in Linux for now.
- */
-struct cfs_stack_trace {
-};
-
 /* long integer with size equal to pointer */
 typedef unsigned long ulong_ptr_t;
 typedef long long_ptr_t;
diff --git a/drivers/staging/lustre/lustre/libcfs/Makefile b/drivers/staging/lustre/lustre/libcfs/Makefile
index 6b1875f..0d2cb62 100644
--- a/drivers/staging/lustre/lustre/libcfs/Makefile
+++ b/drivers/staging/lustre/lustre/libcfs/Makefile
@@ -4,7 +4,7 @@ libcfs-linux-objs := linux-tracefile.o linux-debug.o
 libcfs-linux-objs += linux-prim.o linux-mem.o linux-cpu.o
 libcfs-linux-objs += linux-tcpip.o
 libcfs-linux-objs += linux-proc.o linux-curproc.o
-libcfs-linux-objs += linux-utils.o linux-module.o
+libcfs-linux-objs += linux-module.o
 libcfs-linux-objs += linux-crypto.o linux-crypto-crc32.o
 libcfs-linux-objs += linux-crypto-adler.o
 libcfs-linux-objs += linux-crypto-crc32pclmul.o
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-utils.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-utils.c
deleted file mode 100644
index e73903c..0000000
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-utils.c
+++ /dev/null
@@ -1,75 +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.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.
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- */
-/*
- * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
- *
- * libcfs/libcfs/linux/linux-utils.c
- *
- * Author: Phil Schwan <phil at clusterfs.com>
- */
-
-/*
- * miscellaneous libcfs stuff
- */
-#define DEBUG_SUBSYSTEM S_LNET
-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/lnet.h>
-
-/*
- * Convert server error code to client format. Error codes are from
- * Linux errno.h, so for Linux client---identity.
- */
-int convert_server_error(__u64 ecode)
-{
-	return ecode;
-}
-EXPORT_SYMBOL(convert_server_error);
-
-/*
- * convert <fcntl.h> flag from client to server.
- */
-int convert_client_oflag(int cflag, int *result)
-{
-	*result = cflag;
-	return 0;
-}
-EXPORT_SYMBOL(convert_client_oflag);
-
-void cfs_stack_trace_fill(struct cfs_stack_trace *trace)
-{}
-
-EXPORT_SYMBOL(cfs_stack_trace_fill);
-
-void *cfs_stack_trace_frame(struct cfs_stack_trace *trace, int frame_no)
-{
-	return NULL;
-}
-EXPORT_SYMBOL(cfs_stack_trace_frame);
-- 
1.7.9.5




More information about the devel mailing list