From 65612dba1342e53921b1df7aed01a3ec3832f578 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 19 Mar 2004 17:05:44 +0000 Subject: [PATCH] - Fix some b_1414 build and formatting issues - Apply Oleg's patch to fix 'lctl modules' (b_cray_portals_merge damage) --- lnet/utils/debug.c | 9 +- lustre/include/linux/Makefile.am | 3 - lustre/include/lustre/Makefile | 295 --------------------- lustre/include/lustre/Makefile.in | 295 --------------------- lustre/include/lustre/lustre_user.h | 3 + .../patches/linux-2.6.3-CITI_NFS4_ALL.patch | 2 +- lustre/mds/handler.c | 4 +- lustre/mds/mds_reint.c | 4 +- lustre/portals/utils/debug.c | 9 +- 9 files changed, 18 insertions(+), 606 deletions(-) delete mode 100644 lustre/include/lustre/Makefile delete mode 100644 lustre/include/lustre/Makefile.in diff --git a/lnet/utils/debug.c b/lnet/utils/debug.c index 69880ea..d2aad31 100644 --- a/lnet/utils/debug.c +++ b/lnet/utils/debug.c @@ -65,9 +65,9 @@ static int debug_mask = ~0; static const char *portal_debug_subsystems[] = {"undefined", "mdc", "mds", "osc", "ost", "class", "log", "llite", - "rpc", "mgmt", "portals", "socknal", "qswnal", "pinger", "filter", - "ptlbd", "echo", "ldlm", "lov", "gmnal", "router", "cobd", "ibnal", - NULL}; + "rpc", "mgmt", "portals", "libcfs", "socknal", "qswnal", "pinger", + "filter", "ptlbd", "echo", "ldlm", "lov", "gmnal", "router", "cobd", + "ibnal", NULL}; static const char *portal_debug_masks[] = {"trace", "inode", "super", "ext2", "malloc", "cache", "info", "ioctl", "blocks", "net", "warning", "buffs", "other", "dentry", "portals", @@ -527,7 +527,8 @@ int jt_dbg_mark_debug_buf(int argc, char **argv) static struct mod_paths { char *name, *path; } mod_paths[] = { - {"portals", "lustre/portals/libcfs"}, + {"libcfs", "lustre/portals/libcfs"}, + {"portals", "lustre/portals/portals"}, {"ksocknal", "lustre/portals/knals/socknal"}, {"kptlrouter", "lustre/portals/router"}, {"lvfs", "lustre/lvfs"}, diff --git a/lustre/include/linux/Makefile.am b/lustre/include/linux/Makefile.am index dde079f..cb75fe5 100644 --- a/lustre/include/linux/Makefile.am +++ b/lustre/include/linux/Makefile.am @@ -3,9 +3,6 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution - -#pkginclude_HEADERS = lustre_user.h - EXTRA_DIST = lprocfs_status.h lustre_debug.h lustre_ha.h lustre_lib.h \ lustre_mgmt.h obd_cache.h obd_lov.h lustre_dlm.h lustre_handles.h \ lustre_net.h obd_class.h obd_ost.h obd_support.h lustre_commit_confd.h \ diff --git a/lustre/include/lustre/Makefile b/lustre/include/lustre/Makefile deleted file mode 100644 index 8e3b405..0000000 --- a/lustre/include/lustre/Makefile +++ /dev/null @@ -1,295 +0,0 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. -# include/lustre/Makefile. Generated from Makefile.in by configure. - -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - -# Copyright (C) 2001 Cluster File Systems, Inc. -# -# This code is issued under the GNU General Public License. -# See the file COPYING in this distribution -SHELL = /bin/sh - -srcdir = . -top_srcdir = ../.. - -prefix = -exec_prefix = ${prefix} - -bindir = ${exec_prefix}/usr/bin -sbindir = ${exec_prefix}/usr/sbin -libexecdir = ${exec_prefix}/libexec -datadir = ${prefix}/share -sysconfdir = ${prefix}/etc -sharedstatedir = ${prefix}/com -localstatedir = ${prefix}/var -libdir = ${exec_prefix}/lib -infodir = ${prefix}/info -mandir = ${prefix}/man -includedir = ${prefix}/usr/include -oldincludedir = /usr/include -pkgdatadir = $(datadir)/lustre -pkglibdir = $(libdir)/lustre -pkgincludedir = $(includedir)/lustre -top_builddir = ../.. - -ACLOCAL = ${SHELL} /usr/src/lustre/missing --run aclocal-1.6 -AUTOCONF = ${SHELL} /usr/src/lustre/missing --run autoconf -AUTOMAKE = ${SHELL} /usr/src/lustre/missing --run automake-1.6 -AUTOHEADER = ${SHELL} /usr/src/lustre/missing --run autoheader - -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -INSTALL_PROGRAM = ${INSTALL} -INSTALL_DATA = ${INSTALL} -m 644 -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_SCRIPT = ${INSTALL} -INSTALL_HEADER = $(INSTALL_DATA) -transform = s,x,x, -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_alias = -build_triplet = i686-pc-linux-gnu -host_alias = -host_triplet = i686-pc-linux-gnu -target_alias = -target_triplet = i686-pc-linux-gnu - -EXEEXT = -OBJEXT = o -PATH_SEPARATOR = : -AMTAR = ${SHELL} /usr/src/lustre/missing --run tar -AWK = gawk -CC = gcc -CRAY_PORTALS_INCLUDE = -DEPDIR = .deps -ENABLE_DOC = 0 -GMNAL = -HAVE_LIBEFENCE = -HAVE_LIBREADLINE = -DHAVE_LIBREADLINE=1 -IBNAL = -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LIBEFENCE = -LIBREADLINE = -lreadline -lncurses -LINUX = /usr/src/uml -LINUX25 = -LINUXRELEASE = 2.4.20-6um -MOD_LINK = elf_i386 -PACKAGE = lustre -QSWNAL = -RANLIB = ranlib -RELEASE = 2.4.20_6um_200403190144 -SCIMACNAL = -STRIP = -SYSIO = $(top_srcdir)/../libsysio -VERSION = HEAD -am__include = include -am__quote = -demodir = $(docdir)/demo -docdir = ${prefix}/usr/share/doc/$(PACKAGE) -install_sh = /usr/src/lustre/install-sh -moduledir = $(libdir)/modules/2.4.20-6um/kernel -modulefsdir = $(moduledir)/fs/$(PACKAGE) -modulenetdir = $(moduledir)/net/$(PACKAGE) -pkgexampledir = ${prefix}/usr/lib/$(PACKAGE)/examples -pymoddir = ${prefix}/usr/lib/${PACKAGE}/python/Lustre -rootsbindir = ${exec_prefix}/sbin -with_gm = -with_ib = -with_quadrics = -with_scamac = - -pkginclude_HEADERS = lustre_user.h liblustreapi.h -subdir = include/lustre -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -HEADERS = $(pkginclude_HEADERS) - -DIST_COMMON = $(pkginclude_HEADERS) Makefile.am Makefile.in -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/lustre/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -uninstall-info-am: -pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) -install-pkgincludeHEADERS: $(pkginclude_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \ - $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \ - done - -uninstall-pkgincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \ - rm -f $(DESTDIR)$(pkgincludedir)/$$f; \ - done - -ETAGS = etags -ETAGSFLAGS = - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - -distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) - -installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) - -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -info: info-am - -info-am: - -install-data-am: install-pkgincludeHEADERS - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS - -.PHONY: GTAGS all all-am check check-am clean clean-generic distclean \ - distclean-generic distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-pkgincludeHEADERS install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic tags \ - uninstall uninstall-am uninstall-info-am \ - uninstall-pkgincludeHEADERS - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lustre/include/lustre/Makefile.in b/lustre/include/lustre/Makefile.in deleted file mode 100644 index 35f3178..0000000 --- a/lustre/include/lustre/Makefile.in +++ /dev/null @@ -1,295 +0,0 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. -# @configure_input@ - -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# Copyright (C) 2001 Cluster File Systems, Inc. -# -# This code is issued under the GNU General Public License. -# See the file COPYING in this distribution -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_alias = @build_alias@ -build_triplet = @build@ -host_alias = @host_alias@ -host_triplet = @host@ -target_alias = @target_alias@ -target_triplet = @target@ - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -AMTAR = @AMTAR@ -AWK = @AWK@ -CC = @CC@ -CRAY_PORTALS_INCLUDE = @CRAY_PORTALS_INCLUDE@ -DEPDIR = @DEPDIR@ -ENABLE_DOC = @ENABLE_DOC@ -GMNAL = @GMNAL@ -HAVE_LIBEFENCE = @HAVE_LIBEFENCE@ -HAVE_LIBREADLINE = @HAVE_LIBREADLINE@ -IBNAL = @IBNAL@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBEFENCE = @LIBEFENCE@ -LIBREADLINE = @LIBREADLINE@ -LINUX = @LINUX@ -LINUX25 = @LINUX25@ -LINUXRELEASE = @LINUXRELEASE@ -MOD_LINK = @MOD_LINK@ -PACKAGE = @PACKAGE@ -QSWNAL = @QSWNAL@ -RANLIB = @RANLIB@ -RELEASE = @RELEASE@ -SCIMACNAL = @SCIMACNAL@ -STRIP = @STRIP@ -SYSIO = @SYSIO@ -VERSION = @VERSION@ -am__include = @am__include@ -am__quote = @am__quote@ -demodir = @demodir@ -docdir = @docdir@ -install_sh = @install_sh@ -moduledir = @moduledir@ -modulefsdir = @modulefsdir@ -modulenetdir = @modulenetdir@ -pkgexampledir = @pkgexampledir@ -pymoddir = @pymoddir@ -rootsbindir = @rootsbindir@ -with_gm = @with_gm@ -with_ib = @with_ib@ -with_quadrics = @with_quadrics@ -with_scamac = @with_scamac@ - -pkginclude_HEADERS = lustre_user.h liblustreapi.h -subdir = include/lustre -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -HEADERS = $(pkginclude_HEADERS) - -DIST_COMMON = $(pkginclude_HEADERS) Makefile.am Makefile.in -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/lustre/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -uninstall-info-am: -pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) -install-pkgincludeHEADERS: $(pkginclude_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \ - $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \ - done - -uninstall-pkgincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \ - rm -f $(DESTDIR)$(pkgincludedir)/$$f; \ - done - -ETAGS = etags -ETAGSFLAGS = - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - -distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) - -installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) - -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -info: info-am - -info-am: - -install-data-am: install-pkgincludeHEADERS - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS - -.PHONY: GTAGS all all-am check check-am clean clean-generic distclean \ - distclean-generic distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-pkgincludeHEADERS install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic tags \ - uninstall uninstall-am uninstall-info-am \ - uninstall-pkgincludeHEADERS - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/lustre/lustre_user.h index 2eba485..79aa677 100644 --- a/lustre/include/lustre/lustre_user.h +++ b/lustre/include/lustre/lustre_user.h @@ -32,10 +32,13 @@ #define LL_IOC_LOV_GETSTRIPE _IOW ('f', 155, long) #define LL_IOC_LOV_SETEA _IOW ('f', 156, long) #define LL_IOC_RECREATE_OBJ _IOW ('f', 157, long) +#define LL_IOC_CW_LOCK _IOW ('f', 158, long) +#define LL_IOC_CW_UNLOCK _IOW ('f', 159, long) #define O_LOV_DELAY_CREATE 0100000000 /* hopefully this does not conflict */ #define LL_FILE_IGNORE_LOCK 0x00000001 +#define LL_FILE_CW_LOCKED 0x00000002 #define LOV_USER_MAGIC_V1 0x0BD10BD0 #define LOV_USER_MAGIC LOV_USER_MAGIC_V1 diff --git a/lustre/kernel_patches/patches/linux-2.6.3-CITI_NFS4_ALL.patch b/lustre/kernel_patches/patches/linux-2.6.3-CITI_NFS4_ALL.patch index 76c8535..726957c 100644 --- a/lustre/kernel_patches/patches/linux-2.6.3-CITI_NFS4_ALL.patch +++ b/lustre/kernel_patches/patches/linux-2.6.3-CITI_NFS4_ALL.patch @@ -5336,7 +5336,7 @@ diff -puN /dev/null include/linux/sunrpc/svcauth_gss.h + * Bruce Fields + * Copyright (c) 2002 The Regents of the Unviersity of Michigan + * -+ * $Id: linux-2.6.3-CITI_NFS4_ALL.patch,v 1.4 2004/03/19 13:37:51 shaocheng Exp $ ++ * Id: linux-2.6.3-CITI_NFS4_ALL.patch,v 1.2.4.1 2004/03/17 23:55:23 adilger Exp $ + * + */ + diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c index ff8a2f5..4a723bf 100644 --- a/lustre/mds/handler.c +++ b/lustre/mds/handler.c @@ -555,7 +555,7 @@ static int mds_getattr_internal(struct obd_device *obd, struct dentry *dentry, mds_pack_inode2body(body, inode); if ((S_ISREG(inode->i_mode) && (reqbody->valid & OBD_MD_FLEASIZE)) || - (S_ISDIR(inode->i_mode) && (reqbody->valid & OBD_MD_FLDIREA))){ + (S_ISDIR(inode->i_mode) && (reqbody->valid & OBD_MD_FLDIREA))) { rc = mds_pack_md(obd, req->rq_repmsg, reply_off + 1, body, inode, 1); @@ -604,7 +604,7 @@ static int mds_getattr_pack_msg(struct ptlrpc_request *req, struct inode *inode, LASSERT_REQSWABBED(req, offset); /* swabbed by caller */ if ((S_ISREG(inode->i_mode) && (body->valid & OBD_MD_FLEASIZE)) || - (S_ISDIR(inode->i_mode) && (body->valid & OBD_MD_FLDIREA))){ + (S_ISDIR(inode->i_mode) && (body->valid & OBD_MD_FLDIREA))) { int rc; down(&inode->i_sem); rc = fsfilt_get_md(req->rq_export->exp_obd, inode, NULL, 0); diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c index f55fe9e..889d2cd 100644 --- a/lustre/mds/mds_reint.c +++ b/lustre/mds/mds_reint.c @@ -428,8 +428,8 @@ static int mds_reint_setattr(struct mds_update_record *rec, int offset, else /* setattr */ rc = fsfilt_setattr(obd, de, handle, &rec->ur_iattr, 0); - if (rc == 0 && (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)) - && rec->ur_eadata != NULL) { + if (rc == 0 && (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)) && + rec->ur_eadata != NULL) { struct lov_stripe_md *lsm = NULL; rc = obd_iocontrol(OBD_IOC_LOV_SETSTRIPE, diff --git a/lustre/portals/utils/debug.c b/lustre/portals/utils/debug.c index 69880ea..d2aad31 100644 --- a/lustre/portals/utils/debug.c +++ b/lustre/portals/utils/debug.c @@ -65,9 +65,9 @@ static int debug_mask = ~0; static const char *portal_debug_subsystems[] = {"undefined", "mdc", "mds", "osc", "ost", "class", "log", "llite", - "rpc", "mgmt", "portals", "socknal", "qswnal", "pinger", "filter", - "ptlbd", "echo", "ldlm", "lov", "gmnal", "router", "cobd", "ibnal", - NULL}; + "rpc", "mgmt", "portals", "libcfs", "socknal", "qswnal", "pinger", + "filter", "ptlbd", "echo", "ldlm", "lov", "gmnal", "router", "cobd", + "ibnal", NULL}; static const char *portal_debug_masks[] = {"trace", "inode", "super", "ext2", "malloc", "cache", "info", "ioctl", "blocks", "net", "warning", "buffs", "other", "dentry", "portals", @@ -527,7 +527,8 @@ int jt_dbg_mark_debug_buf(int argc, char **argv) static struct mod_paths { char *name, *path; } mod_paths[] = { - {"portals", "lustre/portals/libcfs"}, + {"libcfs", "lustre/portals/libcfs"}, + {"portals", "lustre/portals/portals"}, {"ksocknal", "lustre/portals/knals/socknal"}, {"kptlrouter", "lustre/portals/router"}, {"lvfs", "lustre/lvfs"}, -- 1.8.3.1