From: Prakash Surya Date: Tue, 18 Dec 2012 19:44:39 +0000 (-0800) Subject: LU-2158 lvfs: Remove cruft from lvfs directory X-Git-Tag: 2.3.59~11 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=7a0f39612eca0c6c189ab3da4277ccd4ea279a30;p=fs%2Flustre-release.git LU-2158 lvfs: Remove cruft from lvfs directory Some of the unnecessary cruft from within the lvfs directory was removed by this change. Specifically, the following changes were made: * Removed files: * Info.plist * lvfs_darwin.c * lvfs_internal.h * lvfs_userfs.c * Cleaned up the autoMakefile.am and Makefile.in files to reflect the removed files. Change-Id: Icc7189912415e96b81dde384491c1948fa4ef06a Signed-off-by: Prakash Surya Signed-off-by: Christopher J. Morrone Reviewed-on: http://review.whamcloud.com/4858 Reviewed-by: Andreas Dilger Tested-by: Hudson Tested-by: Maloo Reviewed-by: James Simmons --- diff --git a/lustre/lvfs/Info.plist b/lustre/lvfs/Info.plist deleted file mode 100644 index 44439e2..0000000 --- a/lustre/lvfs/Info.plist +++ /dev/null @@ -1,37 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - lvfs - CFBundleIconFile - - CFBundleIdentifier - com.clusterfs.lustre.lvfs - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - KEXT - CFBundleSignature - ???? - CFBundleVersion - 1.0.1 - OSBundleCompatibleVersion - 1.0.0 - OSBundleLibraries - - com.apple.kpi.bsd - 8.0.0b1 - com.apple.kpi.libkern - 8.0.0b1 - com.apple.kpi.mach - 8.0.0b1 - com.apple.kpi.unsupported - 8.0.0b1 - com.clusterfs.lustre.libcfs - 1.0.0 - - - diff --git a/lustre/lvfs/Makefile.in b/lustre/lvfs/Makefile.in index cd2b0d8..2e62ded 100644 --- a/lustre/lvfs/Makefile.in +++ b/lustre/lvfs/Makefile.in @@ -8,9 +8,7 @@ lvfs-objs := lvfs_common.o lvfs_linux.o fsfilt.o lvfs_lib.o $(obj)/fsfilt-%.c: $(obj)/fsfilt_%.c ln -s $< $@ -EXTRA_DIST = $(lvfs-objs:.o=.c) \ - fsfilt_ext3.c \ - lvfs_internal.h lvfs_userfs.c +EXTRA_DIST = $(lvfs-objs:.o=.c) fsfilt_ext3.c # for on 2.6 EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFS_DIR@ -I@LDISKFS_DIR@/ldiskfs diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am index be3aa22..61301e3 100644 --- a/lustre/lvfs/autoMakefile.am +++ b/lustre/lvfs/autoMakefile.am @@ -38,13 +38,9 @@ if LIBLUSTRE noinst_LIBRARIES = liblvfs.a -liblvfs_a_SOURCES = lvfs_userfs.c lvfs_lib.c +liblvfs_a_SOURCES = lvfs_lib.c liblvfs_a_CFLAGS = $(LLCFLAGS) liblvfs_a_CPPFLAGS = $(LLCPPFLAGS) - -#if MYSQL -#liblvfs_a_SOURCES += lvfs_user_mysql.c -#endif endif if MODULES @@ -74,27 +70,8 @@ ldiskfs_sed_flags = \ fsfilt_ldiskfs.c: fsfilt_ext3.c sed $(strip $(ldiskfs_sed_flags)) $< > $@ -fsfilt_ldiskfs_quota.h: fsfilt_ext3_quota.h - sed $(strip $(ldiskfs_sed_flags)) $< > $@ - endif # LINUX -if DARWIN - -macos_PROGRAMS = lvfs - -lvfs_SOURCES = lvfs_darwin.c - -lvfs_CFLAGS := $(EXTRA_KCFLAGS) -lvfs_LDFLAGS := $(EXTRA_KLDFLAGS) -lvfs_LDADD := $(EXTRA_KLIBS) - -plist_DATA = Info.plist - -install_data_hook = fix-kext-ownership - -endif # DARWIN - else # MODULES sources: @@ -103,5 +80,5 @@ endif # MODULES install-data-hook: $(install_data_hook) -MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ +MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ CLEANFILES = fsfilt-*.c fsfilt_ldiskfs*.c fsfilt_extN.c sources diff --git a/lustre/lvfs/lvfs_darwin.c b/lustre/lvfs/lvfs_darwin.c deleted file mode 100644 index 494ec22..0000000 --- a/lustre/lvfs/lvfs_darwin.c +++ /dev/null @@ -1,78 +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) 2007, 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. - */ - -#define DEBUG_SUBSYSTEM S_FILTER - -#include -#include -#include -#include - -atomic_t obd_memory; -int obd_memmax; - -/* XXX currently ctxt functions should not be used ?? */ -void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx, - struct lvfs_ucred *cred) -{ - LBUG(); -} - -void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx, - struct lvfs_ucred *cred) -{ - LBUG(); -} - -static int __init lvfs_init(void) -{ - int ret = 0; - ENTRY; - - RETURN(ret); -} - -static void __exit lvfs_exit(void) -{ - int leaked; - ENTRY; - - leaked = atomic_read(&obd_memory); - CDEBUG(leaked ? D_ERROR : D_INFO, - "obd mem max: %d leaked: %d\n", obd_memmax, leaked); - - return; -} - -cfs_module(lvfs, "1.0.0", lvfs_init, lvfs_exit); diff --git a/lustre/lvfs/lvfs_internal.h b/lustre/lvfs/lvfs_internal.h deleted file mode 100644 index 1d9a70b..0000000 --- a/lustre/lvfs/lvfs_internal.h +++ /dev/null @@ -1,39 +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) 2003, 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. - */ - -int fsfilt_ext3_init(void); -void fsfilt_ext3_exit(void); - -int fsfilt_reiser_init(void); -void fsfilt_reiser_exit(void); diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c index eef01f4..91b8466 100644 --- a/lustre/lvfs/lvfs_linux.c +++ b/lustre/lvfs/lvfs_linux.c @@ -54,7 +54,6 @@ #include #include #include -#include "lvfs_internal.h" #include #include diff --git a/lustre/lvfs/lvfs_userfs.c b/lustre/lvfs/lvfs_userfs.c deleted file mode 100644 index b1523c2..0000000 --- a/lustre/lvfs/lvfs_userfs.c +++ /dev/null @@ -1,59 +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) 2003, 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. - * - * lustre/lvfs/lvfs_userfs.c - * - * Lustre filesystem abstraction routines - * - * Author: Andreas Dilger - */ - -#include -#include -#include "lvfs_internal.h" - -#include -#include - -/* XXX currently ctxt functions should not be used ?? */ -void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx, - struct lvfs_ucred *uc) -{ - LBUG(); -} - -void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx, - struct lvfs_ucred *uc) -{ - LBUG(); -}