From b9d459bb13787ec1d3f2ca8f099fe54f27b32eb2 Mon Sep 17 00:00:00 2001 From: phil Date: Thu, 10 Feb 2005 23:33:09 +0000 Subject: [PATCH] - BUGS should just point at bugzilla - nodist doesn't need to reference obdext2 anymore - rename COPYING to LICENSE and make it somewhat clearer - remove the unused mgmt/ module; we know how to get it back. --- lustre/BUGS | 16 +- lustre/LICENSE | 372 +++++++++++++++++++++++++++++ lustre/{COPYING => kernel_patches/LICENSE} | 7 + lustre/mgmt/Makefile.in | 9 - lustre/mgmt/autoMakefile.am | 9 - lustre/mgmt/mgmt_cli.c | 284 ---------------------- lustre/mgmt/mgmt_svc.c | 152 ------------ lustre/nodist | 12 - 8 files changed, 380 insertions(+), 481 deletions(-) create mode 100644 lustre/LICENSE rename lustre/{COPYING => kernel_patches/LICENSE} (98%) delete mode 100644 lustre/mgmt/Makefile.in delete mode 100644 lustre/mgmt/autoMakefile.am delete mode 100644 lustre/mgmt/mgmt_cli.c delete mode 100644 lustre/mgmt/mgmt_svc.c diff --git a/lustre/BUGS b/lustre/BUGS index 9cf6fa2..ba84777 100644 --- a/lustre/BUGS +++ b/lustre/BUGS @@ -1,15 +1 @@ -include /dev/obd in the documentation - - -attach: attaching ext2obd allows ext2 module to be unloaded. Unload, -then do cleanup, get Oops... - -syncing: invalid IOCTL - -create: more than one object - -preallocate: IOCTL - -statfs: - -restoresnap: decrements directory count for ext2 +To report bugs, please visit http://bugzilla.clusterfs.com/ diff --git a/lustre/LICENSE b/lustre/LICENSE new file mode 100644 index 0000000..6c14df9 --- /dev/null +++ b/lustre/LICENSE @@ -0,0 +1,372 @@ +Each file in this distribution should contain a header stating the +copyright owner(s), and the licensing terms for that module. Some +files are not eligible for copyright protection, and contain neither. + +There are many files which may be covered by a separate Evaluation +License Agreement that you may have signed before downloading this +software. If you did not sign such an agreement, or if the file does +not mention that license, then you can redistribute and/or modify it +under the terms of version 2 of the GNU General Public License. +Each file is very clear about which license is applicable. + +In any case, Lustre 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 +license text for more details. + +Reproduced below is the GNU General Public License version 2, and +Linus's clarifying statement from the Linux kernel source code: + +---------------------------------------- + + NOTE! This copyright does *not* cover user programs that use kernel + services by normal system calls - this is merely considered normal use + of the kernel, and does *not* fall under the heading of "derived work". + Also note that the GPL below is copyrighted by the Free Software + Foundation, but the instance of code that it refers to (the Linux + kernel) is copyrighted by me and others who actually wrote it. + + Linus Torvalds + +---------------------------------------- + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + 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 for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/lustre/COPYING b/lustre/kernel_patches/LICENSE similarity index 98% rename from lustre/COPYING rename to lustre/kernel_patches/LICENSE index c69cfd8..dd7f676 100644 --- a/lustre/COPYING +++ b/lustre/kernel_patches/LICENSE @@ -1,3 +1,10 @@ +All files in this subtree are licensed under the terms and conditions +of the GNU General Public License version 2. + +Reproduced below is the GPL v2, and Linus's clarifying statement from +the Linux kernel source code: + +---------------------------------------- NOTE! This copyright does *not* cover user programs that use kernel services by normal system calls - this is merely considered normal use diff --git a/lustre/mgmt/Makefile.in b/lustre/mgmt/Makefile.in deleted file mode 100644 index 15ec356..0000000 --- a/lustre/mgmt/Makefile.in +++ /dev/null @@ -1,9 +0,0 @@ -MODULES := mgmt_svc mgmt_cli -ifeq ($(PATCHLEVEL),6) -mgmt_svc-objs := mgmt-svc.o -mgmt_cli-objs := mgmt-cli.o -mgmt-%.c: mgmt_%.c - ln -sf $< $@ -endif - -@INCLUDE_RULES@ diff --git a/lustre/mgmt/autoMakefile.am b/lustre/mgmt/autoMakefile.am deleted file mode 100644 index 0966ec8..0000000 --- a/lustre/mgmt/autoMakefile.am +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2001 Cluster File Systems, Inc. -# -# This code is issued under the GNU General Public License. -# See the file COPYING in this distribution - -modulefs_DATA = mgmt-svc$(KMODEXT) mgmt-cli$(KMODEXT) - -MOSTLYCLEANFILES = *.o *.ko *.mod.c -DIST_SOURCES = $(mgmt-svc-objs:.o=.c) $(mgc-cli-objs:.o=.c) diff --git a/lustre/mgmt/mgmt_cli.c b/lustre/mgmt/mgmt_cli.c deleted file mode 100644 index 313a9d5..0000000 --- a/lustre/mgmt/mgmt_cli.c +++ /dev/null @@ -1,284 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * Implementation of the management/health monitoring client. - * - * Copyright (c) 2003 Cluster File Systems, Inc. - * Author: Mike Shaver - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif -#define DEBUG_SUBSYSTEM S_MGMT -#include -#include - -#include -#include -#include -#include -#include -#include - -/*** Registration and service/thread management. ***/ - -/* An entry representing one obd which has registered for management events. */ -struct mgmtcli_registrant { - struct list_head chain; - struct obd_device *notify_obd; - struct obd_uuid *relevant_uuid; -}; - -static int mgmtcli_pinger_main(void *arg) -{ - struct ptlrpc_svc_data *data = (struct ptlrpc_svc_data *)arg; - struct ptlrpc_thread *thread = data->thread; - unsigned long flags; - struct l_wait_info lwi = { 0 }; - ENTRY; - - lock_kernel(); - /* vv ptlrpc_daemonize(); vv */ - exit_mm(current); - - current->session = 1; - current->pgrp = 1; - current->tty = NULL; - - exit_files(current); - reparent_to_init(); - /* ^^ ptlrpc_daemonize(); ^^ */ - - SIGNAL_MASK_LOCK(current, flags); - sigfillset(¤t->blocked); - RECALC_SIGPENDING; - SIGNAL_MASK_UNLOCK(current, flags); - -#if defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20)) - sprintf(current->comm, "%s|%d", data->name,current->thread.extern_pid); -#elif defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - sprintf(current->comm, "%s|%d", data->name, - current->thread.mode.tt.extern_pid); -#else - strcpy(current->comm, data->name); -#endif - unlock_kernel(); - - /* Record that the thread is running */ - thread->t_flags = SVC_RUNNING; - wake_up(&thread->t_ctl_waitq); - - /* And now, loop forever, pinging as needed. */ - l_wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_STOPPING, &lwi); - - thread->t_flags = SVC_STOPPED; - wake_up(&thread->t_ctl_waitq); - - CDEBUG(D_NET, "pinger thread exiting"); - return 0; -} - -static int mgmtcli_connect_to_svc(struct obd_device *obd) -{ - int rc; - struct mgmtcli_obd *mc = &obd->u.mgmtcli; - struct ptlrpc_svc_data svc_data; - struct ptlrpc_thread *thread; - struct l_wait_info lwi = { 0 }; - struct lustre_handle conn = {0, }; - ENTRY; - - /* Connect to ourselves, and thusly to the mgmt service. */ - rc = client_connect_import(&conn, obd, &obd->obd_uuid); - if (rc) { - CERROR("failed to connect to mgmt svc: %d\n", rc); - (void)client_obd_cleanup(obd, 0); - RETURN(rc); - } - mc->mc_ping_exp = class_conn2export(&conn); - - LASSERT(mc->mc_ping_thread == NULL); - OBD_ALLOC(thread, sizeof (*thread)); - if (thread == NULL) - GOTO(out, rc = -ENOMEM); - mc->mc_ping_thread = thread; - init_waitqueue_head(&thread->t_ctl_waitq); - - svc_data.name = "mgmtcli"; - svc_data.thread = thread; - - rc = kernel_thread(mgmtcli_pinger_main, &svc_data, CLONE_VM | CLONE_FILES); -out: - if (rc < 0) { - CERROR("can't start thread to ping mgmt svc %s: %d\n", - mc->mc_import->imp_target_uuid.uuid, rc); - OBD_FREE(mc->mc_ping_thread, sizeof (*mc->mc_ping_thread)); - (void)client_disconnect_import(mc->mc_ping_exp, 0); - RETURN(rc); - } - l_wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_RUNNING, &lwi); - - RETURN(0); -} - -static int mgmtcli_disconnect_from_svc(struct obd_device *obd) -{ - struct mgmtcli_obd *mc = &obd->u.mgmtcli; - struct obd_import *imp = mc->mc_import; - struct ptlrpc_thread *thread = mc->mc_ping_thread; - struct l_wait_info lwi = { 0 }; - int rc; - - ENTRY; - rc = client_disconnect_import(mc->mc_ping_exp, 0); - if (rc) { - CERROR("can't disconnect from %s: %d (%s)\n", - imp->imp_target_uuid.uuid, rc, - (thread ? - "stopping pinger thread anyway" : - "pinger thread already stopped")); - } - - if (thread) { - thread->t_flags = SVC_STOPPING; - wake_up(&thread->t_ctl_waitq); - l_wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_STOPPED, &lwi); - - OBD_FREE(mc->mc_ping_thread, sizeof (*mc->mc_ping_thread)); - } - - RETURN(rc); -} - -static int mgmtcli_register_for_events(struct obd_device *mgmt_obd, - struct obd_device *notify_obd, - struct obd_uuid *relevant_uuid) -{ - int start_thread; - struct mgmtcli_registrant *reg; - struct mgmtcli_obd *mcobd = &mgmt_obd->u.mgmtcli; - - ENTRY; - if (strcmp(mgmt_obd->obd_type->typ_name, LUSTRE_MGMTCLI_NAME)) - RETURN(-EINVAL); - - OBD_ALLOC(reg, sizeof(*reg)); - if (reg == NULL) - RETURN(-ENOMEM); - - reg->notify_obd = notify_obd; - reg->relevant_uuid = relevant_uuid; /* XXX hash */ - - spin_lock(&mgmt_obd->obd_dev_lock); - start_thread = list_empty(&mcobd->mc_registered); - list_add(®->chain, &mcobd->mc_registered); - spin_unlock(&mgmt_obd->obd_dev_lock); - - if (start_thread) - RETURN(mgmtcli_connect_to_svc(mgmt_obd)); - - RETURN(0); -} - -static int mgmtcli_deregister_for_events(struct obd_device *mgmt_obd, - struct obd_device *notify_obd) -{ - int stop_thread, found = 0; - struct mgmtcli_registrant *reg = NULL; - struct list_head *tmp, *n; - struct mgmtcli_obd *mc = &mgmt_obd->u.mgmtcli; - - ENTRY; - if (strcmp(mgmt_obd->obd_type->typ_name, LUSTRE_MGMTCLI_NAME)) - RETURN(-EINVAL); - - spin_lock(&mgmt_obd->obd_dev_lock); - list_for_each_safe(tmp, n, &mc->mc_registered) { - reg = list_entry(tmp, struct mgmtcli_registrant, chain); - if (reg->notify_obd == notify_obd) { - list_del(®->chain); - found = 1; - OBD_FREE(reg, sizeof(*reg)); - break; - } - } - spin_unlock(&mgmt_obd->obd_dev_lock); - - if (!found) - RETURN(-ENOENT); - RETURN(0); -} - -/*** OBD scaffolding and module paraphernalia. ***/ - -static int mgmtcli_setup(struct obd_device *obd, obd_count len, void *buf) -{ - struct mgmtcli_obd *mc = &obd->u.mgmtcli; - INIT_LIST_HEAD(&mc->mc_registered); - - /* Initialize our nested client_obd structure. */ - RETURN(client_obd_setup(obd, len, buf)); -} - -static int mgmtcli_cleanup(struct obd_device *obd, int flags) -{ - struct mgmtcli_obd *mc = &obd->u.mgmtcli; - - if (!list_empty(&mc->mc_registered)) - RETURN(-EBUSY); - - if (mc->mc_ping_thread) { - rc = mgmtcli_disconnect_from_svc(obd); - if (rc) - RETURN(rc); - } - - RETURN(client_obd_cleanup(obd, flags); -} - -static struct obd_ops mgmtcli_obd_ops = { - .o_owner = THIS_MODULE, - .o_setup = mgmtcli_setup, - .o_cleanup = client_obd_cleanup -}; - -static int __init mgmtcli_init(void) -{ - inter_module_register("mgmtcli_register_for_events", THIS_MODULE, - mgmtcli_register_for_events); - inter_module_register("mgmtcli_deregister_for_events", THIS_MODULE, - mgmtcli_deregister_for_events); - return class_register_type(&mgmtcli_obd_ops, 0, LUSTRE_MGMTCLI_NAME); -} - -static void __exit mgmtcli_exit(void) -{ - class_unregister_type(LUSTRE_MGMTCLI_NAME); - inter_module_unregister("mgmtcli_register_for_events"); - inter_module_unregister("mgmtcli_deregister_for_events"); -} - -#ifdef __KERNEL__ -MODULE_AUTHOR("Cluster File Systems, Inc. "); -MODULE_DESCRIPTION("Lustre monitoring client v0.1"); -MODULE_LICENSE("GPL"); - -module_init(mgmtcli_init); -module_exit(mgmtcli_exit); -#endif diff --git a/lustre/mgmt/mgmt_svc.c b/lustre/mgmt/mgmt_svc.c deleted file mode 100644 index db21485..0000000 --- a/lustre/mgmt/mgmt_svc.c +++ /dev/null @@ -1,152 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * Implementation of the management/health monitoring service. - * - * Copyright (c) 2003 Cluster File Systems, Inc. - * Author: Mike Shaver - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif -#define DEBUG_SUBSYSTEM S_MGMT -#include -#include - -#include -#include - -#define MGMT_NBUFS 128UL -#define MGMT_BUFSIZE 8192 -#define MGMT_MAXREQSIZE 512 -#define MGMT_NUM_THREADS 4 -#define MGMT_DEVICE_NAME "mgmt" - -static int mgmt_initialized; -static struct ptlrpc_service *mgmt_service; - -static int mgmt_ping(struct ptlrpc_request *req) -{ - /* handle_incoming_request will have already updated the export's - * last_request_time, so we don't need to do anything else. - */ - return lustre_pack_msg(0, NULL, NULL, &req->rq_replen, &req->rq_repmsg); -} - -static int mgmt_handler(struct ptlrpc_request *req) -{ - int rc; - ENTRY; - - switch (req->rq_reqmsg->opc) { - case OBD_PING: - DEBUG_REQ(D_RPCTRACE, req, "ping"); - rc = mgmt_ping(req); - break; - case MGMT_CONNECT: - DEBUG_REQ(D_RPCTRACE, req, "connect"); - rc = target_handle_connect(req, NULL /* no recovery handler */); - break; - case MGMT_DISCONNECT: - DEBUG_REQ(D_RPCTRACE, req, "disconnect"); - rc = target_handle_disconnect(req); - break; - default: - DEBUG_REQ(D_RPCTRACE, req, "UNKNOWN OP"); - rc = -EINVAL; - } - - if (rc) - ptlrpc_error(req); - else - ptlrpc_reply(req); - - RETURN(0); -} - -static int mgmt_setup(struct obd_device *obd, obd_count len, void *buf) -{ - int i, rc; - ENTRY; - - if (mgmt_initialized) - RETURN(-EALREADY); - - mgmt_service = - ptlrpc_init_svc(MGMT_NBUFS, MGMT_BUFSIZE, MGMT_MAXREQSIZE, - MGMT_REQUEST_PORTAL, MGMT_REPLY_PORTAL, 30000, - mgmt_handler, "mgmt", obd->obd_proc_entry, NULL); - if (!mgmt_service) { - CERROR("Failed to start mgmt service\n"); - RETURN(-ENOMEM); - } - - rc = ptlrpc_start_n_threads(obd, mgmt_service, MGMT_NUM_THREADS,"mgmt"); - if (rc) - GOTO(err, rc); - - mgmt_initialized = 1; - - RETURN(0); -err: - ptlrpc_unregister_service(mgmt_service); - RETURN(rc): -} - -static int mgmt_cleanup(struct obd_device *obd, int flags) -{ - ENTRY; - - if (!mgmt_initialized) - RETURN(-ENOENT); - - ptlrpc_unregister_service(mgmt_service); - - mgmt_initialized = 0; - RETURN(0); -} - -static struct obd_ops mgmt_obd_ops = { - .o_owner = THIS_MODULE, - .o_setup = mgmt_setup, - .o_cleanup = mgmt_cleanup, - .o_connect = class_connect, - .o_disconnect = class_disconnect -}; - -static int __init mgmt_init(void) -{ - int rc = class_register_type(&mgmt_obd_ops, 0, MGMT_DEVICE_NAME); - - return rc; -} - -static void __exit mgmt_exit(void) -{ - class_unregister_type(MGMT_DEVICE_NAME); -} - -#ifdef __KERNEL__ -MODULE_AUTHOR("Cluster File Systems, Inc. "); -MODULE_DESCRIPTION("Lustre monitoring service v0.1"); -MODULE_LICENSE("GPL"); - -module_init(mgmt_init); -module_exit(mgmt_exit); -#endif diff --git a/lustre/nodist b/lustre/nodist index 91aecad..24f55bb 100644 --- a/lustre/nodist +++ b/lustre/nodist @@ -7,15 +7,3 @@ config.* *.orig *.backup .depfiles -ext2obd/dir.c -ext2obd/file.c -ext2obd/ialloc.c -ext2obd/inode.c -ext2obd/super.c -ext2obd/fsync.c -ext2obd/ioctl.c -ext2obd/balloc.c -ext2obd/acl.c -ext2obd/namei.c -ext2obd/symlink.c -ext2obd/bitmap.c -- 1.8.3.1