Add locking to PV commands.

and made them a little more user-friendly. This is the way users will be told
which nodes an LV/VG is open on.

COPYING

@@ -1,340 +0,0 @@
-		    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.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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) year  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.
-
-  <signature of Ty Coon>, 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.

COPYING.LIB

@@ -1,483 +0,0 @@
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 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.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, 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 library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, 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 companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, 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 library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete 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 distribute a copy of this License along with the
-Library.
-
-  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 Library or any portion
-of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-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 Library, 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 Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you 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.
-
-  If distribution of 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 satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  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.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library 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.
-
-  9. 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 Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-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.
-
-  11. 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 Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library 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 Library.
-
-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.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library 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.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library 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 Library
-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 Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-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
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "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
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. 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 LIBRARY 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
-LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-     Appendix: How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  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.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library 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
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; 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.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

INSTALL

@@ -1,45 +0,0 @@
-LVM2 installation
-=================
-
-1) Install device-mapper
-
-   Ensure the device-mapper has been installed on the machine.
-
-   The device-mapper should be in the kernel (look for 'device-mapper'
-   messages in the kernel logs) and /usr/include/libdevmapper.h 
-   and libdevmapper.so should be present.
-
-   The device-mapper is available from:
-     ftp://ftp.sistina.com/pub/LVM2/device-mapper/
-
-
-2) Generate custom makefiles.
-
-   Run the 'configure' script from the top directory.
-
-   If you wish to use the built-in LVM2 shell and have GNU readline 
-   installed (http://www.gnu.org/directory/readline.html) use:
-     ./configure --enable-readline
-
-   If you don't want to include the LVM1 backwards-compatibility code use:
-     ./configure --with-lvm1=none 
-
-   To separate the LVM1 support into a shared library loaded by lvm.conf use:
-     ./configure --with-lvm1=shared
-
-
-3) Build and install LVM2.
-
-   Run 'make install' from the top directory.
-
-
-4) Create a configuration file
-
-   The tools will work fine without a configuration file being
-   present, but you ought to review the example file in doc/example.conf.
-   For example, specifying the devices that LVM2 is to use can
-   make the tools run more efficiently - and avoid scanning /dev/cdrom!
-
-Please also refer to the WHATS_NEW file and the manual pages for the 
-individual commands.
-

Makefile.in

@@ -1,70 +1,26 @@
 #
-# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2001 Sistina Software
 #
-# This file is part of the LVM2.
+# This LVM library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
 #
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU General Public License v.2.
+# This LVM library 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
+# Library 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
+# You should have received a copy of the GNU Library General Public
+# License along with this LVM library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+# MA 02111-1307, USA
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-SUBDIRS = doc include man 
-
-ifeq ("@INTL@", "yes")
-  SUBDIRS += po
-endif
-
-SUBDIRS += lib tools daemons
-
-ifeq ("@DMEVENTD@", "yes")
-  SUBDIRS += dmeventd
-endif
-
-ifeq ($(MAKECMDGOALS),distclean)
-  SUBDIRS += daemons/clvmd \
-	     dmeventd \
-	     lib/format1 \
-	     lib/format_pool \
-	     lib/locking \
-	     lib/mirror \
-	     lib/snapshot \
-	     po \
-	     test/mm test/device test/format1 test/regex test/filters
-  DISTCLEAN_TARGETS += lib/misc/configure.h
-endif
+SUBDIRS = include man lib tools
 
 include make.tmpl
 
-daemons: lib
-lib: include
-tools: lib
-dmeventd: tools
-po: tools daemons dmeventd
-
-ifeq ("@INTL@", "yes")
-lib.pofile: include.pofile
-tools.pofile: lib.pofile
-daemons.pofile: lib.pofile
-dmeventd.pofile: tools.pofile
-po.pofile: tools.pofile daemons.pofile dmeventd.pofile
-pofile: po.pofile
-endif
-
-ifneq ("@CFLOW_CMD@", "")
-tools.cflow: lib.cflow
-cflow: tools.cflow
-endif
-
-ifneq ("@CSCOPE_CMD@", "")
-cscope.out: tools
-	@CSCOPE_CMD@ -b -R
-all: cscope.out
-endif

README

@@ -1,23 +1,2 @@
-This directory contains LVM2, the new version of the userland LVM
-tools designed for the new device-mapper for the Linux kernel.
-
-The device-mapper needs to be installed before compiling these LVM2 tools.
-
-For more information about LVM2 read the WHATS_NEW file.
-Installation instructions are in INSTALL.
-
-There is no warranty - see COPYING and COPYING.LIB.
-
-Tarballs are available from:
-  ftp://sources.redhat.com/pub/lvm2/
-  ftp://sources.redhat.com/pub/dm/
-
-To access the CVS tree use:
-  cvs -d :pserver:cvs@sources.redhat.com:/cvs/lvm2 login
-  CVS password: cvs
-  cvs -d :pserver:cvs@sources.redhat.com:/cvs/lvm2 co LVM2
-
-Mailing list for discussion/bug reports etc.
-  linux-lvm@redhat.com
-  Subscribe from https://www.redhat.com/mailman/listinfo/linux-lvm
-
+This is pretty much empty so far...if you can't see subdirectories,
+try 'cvs -f update'

TODO

@@ -0,0 +1,35 @@
+before alpha
+------------
+
+FIXME review
+extra validation in format1 (must be done before alpha)
+status flag review (confirm all use of ->status is consistent)
+file system handling (being done)
+error message review
+correct handling of *existing* snapshots
+review statics
+review consistency checks for full compatibility with LVM1
+iospace split/rename
+
+before beta1
+-----------
+
+autobackup/text format
+export/import
+striping
+64bit review
+LVM1 compatible tool exit codes
+
+before 2.0
+----------
+
+partial activation
+atomic transactions
+bidirectional format1/format2 migration tool
+persistent minors
+stats
+snapshots
+pvmove
+
+
+

VERSION

@@ -1 +0,0 @@
-2.02.08-cvs (2006-07-17)

WHATS_NEW

@@ -1,731 +0,0 @@
-Version 2.02.08 - 
-================================
-  Add checks for duplicate LV name, lvid and PV id before writing metadata.
-  Report all sanity check failures, not just the first.
-  Fix missing lockfs on first snapshot creation.
-  Add unreliable --trustcache option to reporting commands.
-  Fix locking for mimage removal.
-  Fix clvmd_init_rhel4 'status' exit code.
-
-Version 2.02.07 - 17th July 2006
-================================
-  Fix activation logic in lvchange --persistent.
-  Don't ignore persistent minor numbers when activating.
-  Use RTLD_GLOBAL when loading shared libraries.
-  Add some forgotten memlock checks to _vg_read to protect against full scans.
-  Add mutex to dmeventd_mirror to avoid concurrent execution.
-  Fix vgreduce --removemissing to return success if VG is already consistent.
-  Fix return code if VG specified on command line is not found.
-  Fix PV tools to include orphaned PVs in default output again.
-  Fixed unaligned access when using clvm.
-  Fix an extra dev_close in a label_read error path.
-  Append patches to commit emails.
-  Fix target_register_events args.
-  Prevent snapshots of mirrors.
-  Add DISTCLEAN_TARGETS to make template for configure.h.
-  More fixes to error paths.
-  Fix lvcreate corelog validation.
-  Add --config for overriding most config file settings from cmdline.
-  Quote arguments when printing command line.
-  Remove linefeed from 'initialising logging' message.
-  Add 'Completed' debug message.
-  Don't attempt library exit after reloading config files.
-  Always compile with libdevmapper, even if device-mapper is disabled.
-
-Version 2.02.06 - 12th May 2006
-===============================
-  Propagate --monitor around cluster.
-  Add --monitor to vgcreate and lvcreate to control dmeventd registration.
-  Filter LCK_NONBLOCK in clvmd lock_vg.
-  Add --nosync to lvcreate with LV flag NOTSYNCED.
-  Use mirror's uuid for a core log.
-  Add mirror log fault-handling policy.
-  Improve mirror warning messages and tidy dmeventd syslog output.
-  Propagate nosync flag around cluster.
-  Allow vgreduce to handle mirror log failures.
-  Add --corelog to lvcreate and lvconvert.
-  Create a log header for replacement in-sync mirror log.
-  Use set_lv() and dev_set() to wipe sections of devices.
-  Add mirror_in_sync() flag to avoid unnecessary resync on activation.
-  Add mirror_library description to example.conf.
-  Fix uuid_from_num() buffer overrun.
-  Make SIZE_SHORT the default for display_size().
-  Fix some memory leaks in error paths found by coverity.
-  Use C99 struct initialisers.
-  Move DEFS into configure.h.
-  Clean-ups to remove miscellaneous compiler warnings.
-  Improve stripe size validation.
-  Increase maximum stripe size limit to physical extent size for lvm2 metadata.
-  Fix activation code to check for pre-existing mirror logs.
-  Tighten region size validation.
-  Ignore empty strings in config files.
-  Require non-zero regionsize and document parameter on lvcreate man page.
-  Invalidate cache if composition of VG changed externally.
-
-Version 2.02.05 - 21st April 2006
-=================================
-  Fix vgid string termination in recent cache code.
-
-Version 2.02.04 - 19th April 2006
-=================================
-  Check for libsepol.
-  Add some cflow & scope support.
-  Separate out DEFS from CFLAGS.
-  Remove inlines and use unique function names.
-
-Version 2.02.03 - 14th April 2006
-=================================
-  vgrename accepts vgid and exported VG.
-  Add --partial to pvs.
-  When choosing between identically-named VGs, also consider creation_host.
-  Provide total log suppression with 2.
-  Fix vgexport/vgimport to set/reset PV exported flag so pv_attr is correct.
-  Add vgid to struct physical_volume and pass with vg_name to some functions.
-  If two or more VGs are found with the same name, use one that is not exported.
-  Whenever vgname is captured, also capture vgid and whether exported.
-  Remove an incorrect unlock_vg() from process_each_lv().
-  Update extent size information in vgchange and vgcreate man pages.
-  Introduce origin_from_cow() and lv_is_visible().
-  pvremove without -f now fails if there's no PV label.
-  Support lvconvert -s.
-  Suppress locking library load failure message if --ignorelockingfailure.
-  Propagate partial mode around cluster.
-  Fix archive file expiration.
-  Fix dmeventd build.
-  clvmd now uses libcman rather than cman ioctls.
-  clvmd will allow new cman to shutdown on request.
-
-Version 2.02.02 - 7th February 2006
-===================================
-  Add %.so: %.a make template rule.
-  Switchover library building to use LIB_SUFFIX.
-  Only do lockfs filesystem sync when suspending snapshots.
-  Always print warning if activation is disabled.
-  vgreduce removes mirror images.
-  Add --mirrorsonly to vgreduce.
-  vgreduce replaces active LVs with error segment before removing them.
-  Set block_on_error parameter if available.
-  Add target_version.
-  Add details to format1 'Invalid LV in extent map' error message.
-  Fix lvscan snapshot full display.
-  Bring lvdisplay man page example into line.
-  Add mirror dmeventd library.
-  Add some activation logic to remove_mirror_images().
-  lvconvert can remove specified PVs from a mirror.
-  lvconvert turns an existing LV into a mirror.
-  Allow signed mirrors arguments.
-  Move create_mirror_log() into toollib.
-  Determine parallel PVs to avoid with ALLOC_NORMAL allocation.
-  Fix lv_empty.
-
-Version 2.02.01 - 23rd November 2005
-====================================
-  Fix lvdisplay cmdline to accept snapshots.
-  Fix open RO->RW promotion.
-  Fix missing vg_revert in lvcreate error path.
-
-Version 2.02.00 - 10th November 2005
-====================================
-  Extend allocation areas to avoid overflow with contiguous with other PVs.
-  Stop lvcreate attempting to wipe zero or error segments.
-  Added new lvs table attributes.
-  Separated out activation preload.
-  Moved activation functions into libdevmapper.
-  Fixed build_dm_name.
-  Add return macros.
-  Added xen xvd devices.
-  Clear up precommitted metadata better.
-  A pvresize implementation.
-  Fix contiguous allocation when there are no preceding segments.
-  Add mirror_seg pointer to lv_segment struct.
-  Only keep a device open if it's known to belong to a locked VG.
-  Fix lvdisplay to show all mirror destinations.
-  Replacement suspend code using libdevmapper dependency tree.
-  Add DEFS to make.tmpl.
-  Use dm_is_dm_major instead of local copy.
-  Allow mapped devices to be used as PVs.
-  Move set_selinux_context into libdevmapper.
-  Fix automatic text metadata buffer expansion (using macro).
-  Cache formatted text metadata buffer between metadata area writes.
-  Add pe_start field to pvs.
-  Add 'LVM-' prefix to uuids.
-  Split lv_segment_area from lv_segment to permit extension.
-  Replacement deactivation code using libdevmapper dependency tree.
-  Simplify dev_manager_info().
-  Attempt to load missing targets using modprobe.
-  Add -a to lvscan.
-  Move mknodes into libdevmapper.
-  Move bitset, hash, pool and dbg_malloc into libdevmapper.
-
-Version 2.01.15 - 16th October 2005
-===================================
-  Refuse to run pvcreate/pvremove on devices we can't open exclusively.
-  Use ORPHAN lock definition throughout.
-  Validate chunksize in lvcreate.
-  Reduce chunksize limit to 512k.
-  Fix chunksize field in reports.
-  Don't hide snapshots from default 'lvs' output.
-  Add is_dm_major() for use in duplicate device detection in lvmcache_add().
-  Really switch device number in lvmcache when it says it is doing so.
-  Option for bitset memory allocation using malloc as well as pool.
-  Don't assume exactly two mirrors when parsing mirror status.
-  Suppress fsync() error message on filesystems that don't support it.
-  Fix yes_no_prompt() error handling.
-  Add lvm.conf comment warning against multiple filter lines.
-  Tidy lvmconf.sh.
-  Add format1 dev_write debug messages.
-  Add clustered VG attribute to report.
-  Move lvconvert parameters into struct lvconvert_params.
-  Add clustered VG flag to LV lock requests.
-  Change LV locking macros to take lv instead of lvid.
-  Prepend 'cluster' activation parameter to mirror log when appropriate.
-  Pass exclusive flag to lv_activate and on to target activation code.
-  Prevent snapshot creation in a clustered VG for now.
-  Factor out adjusted_mirror_region_size() and generate_log_name_format().
-  Move compose_log_line() into mirror directory.
-  Factor out _get_library_path().
-  Don't kill idling clvmd threads.
-  clvmd no longer takes out locks for non-clustered LVs.
-  Recognise ATA over Ethernet (aoe) devices.
-
-Version 2.01.14 - 4th August 2005
-=================================
-  Fix lvconvert PV parameter in help string.
-  Prevent snapshots getting activated in a clustered VG.
-  Separate out _build_dev_string.
-  Move zero_lv to toollib.
-  Fix pool format handler to work with pv segment code.
-
-Version 2.01.13 - 13th July 2005
-================================
-  Fix pvmove segment splitting.
-  Abstract vg_validate.
-  Only make one attempt at contiguous allocation.
-  Fix lvm1 format metadata read.
-  Fix lvm1 format non-mirror lvcreate.
-
-Version 2.01.12 - 14th June 2005
-================================
-  Various allocation-related pvmove fixes.
-  Log an error if clvmd can't resolve a host name got from CCS.
-  Fix potential spin loop in clvmd.
-
-Version 2.01.11 - 13th June 2005
-================================
-  Added lvmconf.sh.
-  Use matchpathcon mode parameter.
-  Don't defer closing dead FDs in clvmd.
-  Remove hard-coded 64k text metadata writing restriction.
-  Make VG name restrictions consistent.
-  Introduce lvconvert.  So far only removes mirror images.
-  Allow mirror images to be resized.
-  Allow mirror images to have more than one segment.
-  Centralise restrictions on LV names.
-  Always insert an intermediate layer for mirrors.
-  Suppress hidden LVs from reports unless --all is given.
-  Use square brackets for hidden LVs in reports.
-  Allow the creation of mirrors with contiguous extents.
-  Always perform sanity checks against metadata before committing it to disk.
-  Split lv_extend into two steps: choosing extents + allocation to LV(s).
-  Add mirror log region size to metadata.
-  Use list_iterate_items throughout and add list*back macros.
-  Introduce seg_ macros to access areas.
-  Add segtype_is_ macros.
-  Support tiny metadata areas for pool conversions.
-  Mirror activation handles disk log as well as core.
-  Activation code recognises mirror log dependency.
-  Add mirror_log and regionsize fields to report.
-  Fix non-orphan pvchange -u.
-  Fix vgmerge to handle duplicate LVIDs.
-  Move archiver code from tools into library.
-  vgscan/change/display/vgs automatically create metadata backups if needed.
-  Merge cloned allocation functions.
-  Fix contiguous allocation policy with linear.
-  Cope with missing format1 PVs again.
-  Remove lists of free PV segments.
-  Simplify pv_maps code and remove slow bitset algorithm.
-  Red-Hat-ify the clvmd rhel4 initscript.
-  %Zu->%zu
-  Fix loopfiles alias alloc & mem debugging.
-  Un-inline dbg_strdup.
-  lv_reduce tidying.
-  Remove some unnecessary parameters.
-  Introduce seg_is macros.
-
-Version 2.01.10 - 3rd May 2005
-==============================
-  Don't create backup and archive dirs till needed.
-  Reinstate full PV size when removing from VG.
-  Support loopfiles for testing.
-  Tidy lv_segment interface.
-  pv_segment support.
-  vgchange --physicalextentsize
-  Internal snapshot restructuring.
-  Remove unused internal non-persistent snapshot option.
-  Allow offline extension of snapshot volumes.
-  Move from 2-step to 3-step on-disk metadata commit.
-  Scan ramdisks too and allow non-O_DIRECT fallback.
-  Annotate, tidy and extend list.h.
-  Alignment tidying.
-  Make clvmd work around some "bugs" in gulm's node state notifications.
-  Tidy clvmd's SIGHUP handler
-
-Version 2.01.09 - 4th April 2005
-================================
-  Add --ignorelockingfailure to vgmknodes.
-  clvmd: Don't allow user operations to start until the lvm thread is fully up.
-  clvmd-gulm: set KEEPALIVE on sockets.
-
-Version 2.01.08 - 22nd March 2005
-=================================
-  Add clustered attribute so vgchange can identify clustered VGs w/o locking.
-  Improve detection of external changes affecting internal cache.
-  Add 'already in device cache' debug message.
-  Add -a to pvdisplay -C.
-  Avoid rmdir opendir error messsages when dir was already removed.
-  Tighten signal handlers.
-  Avoid some compiler warnings.
-  Additional rename failure error message.
-  read/write may be macros.
-  clvmd: don't take out lvm thread lock at startup, it only protects jobs list.
-
-Version 2.01.07 - 8th March 2005
-================================
-  Cope with new devices appearing by rescanning /dev if a uuid can't be found.
-  Remove DESTDIR from LVM_SHARED_PATH.
-  clvmd fixes: make FDs close-on-exec
-               gulm unlocks VG & orphan locks at startup in case they are stale
-               gulm now unlocks VG & orphan locks if client dies.
-
-Version 2.01.06 - 1st March 2005
-================================
-  Suppress 'open failed' error messages during scanning.
-  Option to suppress warnings of file descriptors left open.
-  Fix default value of metadatacopies in documentation (2->1).
-  Fix clvmd-gulm locking.
-  ./configure --enable-debug now enables debugging code in clvmd.
-  Fix clvmd-gulm node up/down code so it actually works.
-  clvmd-gulm now releases locks when shut down.
-
-Version 2.01.05 - 18th February 2005
-====================================
-  Static binary invokes dynamic binary if appropriate.
-  Make clvmd config check a little more tolerant.
-  gulm clvmd can now cope with >1 message arriving in a TCP message.
-
-Version 2.01.04 - 9th February 2005
-===================================
-  Add fixed offset to imported pool minor numbers.
-  Update binary pathnames in clvmd_init_rhel4.
-  lvm2cmd.so should skip the check for open fds.
-  Remove unused -f from pvmove.
-  Gulm clvmd doesn't report "connection refused" errors.
-  clvmd does a basic config file sanity check at startup.
-  Fix potential thread shutdown race in clvmd.
-
-Version 2.01.03 - 1st February 2005
-===================================
-  More 64-bit display/report fixes.
-  More informative startup mesg if can't create /etc/lvm.
-  Fix snapshot device size bug (since 2.01.01).
-  clvmd announces startup and cluster connection in syslog.
-  Gulm clvmd doesn't hang trying to talk to a rebooted node.
-  Gulm clvmd doesn't print cman error on startup.
-
-Version 2.01.02 - 21st January 2005
-===================================
-  Update clvmd_init_rhel4: use lvm.static and don't load dlm.
-  Fix some size_t printing.
-  Fix 64 bit xlate consts.
-  Split out pool sptype_names to avoid unused const.
-  Always fail if random id generation fails.
-  Recognise gnbd devices.
-  Fix clvmd startup bug introduced in cman/gulm amalgamation.
-  Improve reporting of node-specific locking errors.
-
-Version 2.01.01 - 19th January 2005
-===================================
-  Fix clvmd lv_info_by_lvid open_count.
-  Store snapshot and origin sizes separately.
-  Update vgcreate man page.
-
-Version 2.01.00 - 17th January 2005
-===================================
-  Fix vgscan metadata auto-correction.
-  Only ask libdevmapper for open_count when we need it.
-  Adjust RHEL4 clvmd init script priority.
-  Enable building of CMAN & GULM versions of clvmd into a single binary
-
-Version 2.00.33 - 7th January 2005
-==================================
-  pvcreate wipes first 4 sectors unless given --zero n.
-  gulm clvmd now uses new ccsd key names.
-  gulm clvmd now doesn't ignore the first node in cluster.conf
-  Improve clvmd failure message if it's already running.
-  Allow user to kill clvmd during initialisation.
-  Fix off-by-one error in cluster_locking that could cause read hangs.
-
-Version 2.00.32 - 22nd December 2004
-====================================
-  Drop static/dl restriction for now.
-  Fix an error fprintf.
-  Fix vgdisplay -s. Breaks (undocumented) lvs/pvs/vgs -s instead for now.
-  Fix device reference counting on re-opens.
-  Ignore sysfs symlinks when DT_UNKNOWN.
-  Add clvmd init script for RHEL4.
-  Skip devices that are too small to be PVs.
-  Fix pvchange -x segfault with lvm2-format orphan.
-  Cope with empty msdos partition tables.
-  Add CONTRIBUTORS file.
-
-Version 2.00.31 - 12th December 2004
-====================================
-  Reopen RO file descriptors RW if necessary.
-
-Version 2.00.30 - 10th December 2004
-====================================
-  Additional device-handling debug messages.
-  Additional verbosity level -vvvv includes line numbers and backtraces.
-  Verbose messages now go to stderr not stdout.
-  Close any stray file descriptors before starting.
-  Refine partitionable checks for certain device types.
-  Allow devices/types to override built-ins.
-  Fix lvreduce man page .i->.I
-  Fix vgsplit man page title.
-  Fix clvmd man makefile.
-  Extend dev_open logging.
-  Make clvmd_fix_conf.sh UNDOable.
-
-Version 2.00.29 - 27th November 2004
-====================================
-  xlate compilation fix.
-
-Version 2.00.28 - 27th November 2004
-====================================
-  Fix partition table & md signature detection.
-  Minor configure/makefile tidy.
-  Export version.h from tools for clvmd.
-
-Version 2.00.27 - 24th November 2004
-====================================
-  Trap large memory allocation requests.
-  Fix to partition table detection code.
-  Improve filter debug mesgs.
-  Make clvmd_fix_conf.sh UNDOable
-
-Version 2.00.26 - 23rd November 2004
-====================================
-  Improve pool debugging stats.
-  Detect partition table signature.
-  pvcreate wipes md superblocks. (With --uuid or --restorefile it prompts.)
-  Separate out md superblock detection code.
-  Prevent snapshot origin resizing.
-  Improve a vgremove error message.
-  Update some man pages.
-  Allow y/n with -ae args (exclusive activation).
-  Fixes to lvcreate vgname parsing.
-  Fix dm_name string size calculation.
-  Improve clvmd error reporting during startup.
-  Make clvmd cope with large gaps in node numbers IDs.
-  Make clvmd initialisation cope better with debugging output.
-  Tidy clvmd socket callbacks so all work happens outside main loop.
-  clvmd -V now displays lvm version too.
-  Add optional gulm build for clvmd
-
-Version 2.00.25 - 29th September 2004
-=====================================
-  Fix return code from rm_link for vgmknodes.
-  Make clvmd LV hash table thread-safe.
-  Fix clvmd locking so it will lock out multiple users on the same node.
-  Fix clvmd VG locking to it can cope with multiple VG locks.
-  Remove spurious trailing dot in lvreduce man page.
-  Fix vgremove locking.
-
-Version 2.00.24 - 16th September 2004
-=====================================
-  Fix pool_empty so it really does empty the memory pool.
-  Rename old segtypes files to segtype.
-  Some fixes to memory debugging code.
-  Exclude internal commands formats & segtypes from install.
-
-Version 2.00.23 - 15th September 2004
-=====================================
-  Export dm name build & split functions.
-  Use O_NOATIME on devices if available.
-  Write log message when each segtype/format gets initialised.
-  New commands 'segtypes' and 'formats'.
-  Suppress pvmove abort message in test mode.
-  Improve pvcreate/remove device not found error message.
-  Allow pvmove to move data within the same PV.
-  Describe how pvmove works on man page.
-  Test for incompatible format/segtype combinations in lv_extend.
-  Fix lvchange example on man page.
-
-Version 2.00.22 - 3rd September 2004
-====================================
-  Fix /dev/vgname perms.
-  Restructure xlate.h.
-  Add clvmd man page.
-
-Version 2.00.21 - 19th August 2004
-==================================
-  Update cnxman-socket.h from cman.
-  Recognise iseries/vd devices.
-  Use 'make install_cluster' to install cluster extensions only.
-  Cope with DT_UNKNOWN in sysfs.
-  Fix extents_moved metadata size comment.
-  Remove duplicate line in pvremove help text.
-  Support variable mirror region size.
-  Support PE ranges in pvmove source PV.
-  Fixes to as-yet-unused LV segment splitting code.
-  Change alloc_areas to pe_ranges and allow suppression of availability checks.
-  Add dev_size column to pvs.
-  Add report columns for in-kernel device number.
-
-Version 2.00.20 - 3 July 2004
-=============================
-  More autoconf fixes.
-  Fix device number handling for 2.6 kernels.
-
-Version 2.00.19 - 29 June 2004
-==============================
-  Reduce severity of setlocale failure message.
-  Recognise argv[0] "initrd-lvm" (pld-linux).
-  Make -O2 configurable.
-  Added --disable-selinux to configure script.
-  LD_FLAGS->LDFLAGS & LD_DEPS->LDDEPS in configure script.
-  Add init_debug to clvmd.
-
-Version 2.00.18 - 24 June 2004
-==============================
-  Fix vgchange activation.
-  Add cluster support.
-
-Version 2.00.17 - 20 June 2004
-==============================
-  configure --enable-fsadm to try out fsadm.  fsadm is not tested yet.
-  Display all filtered devices, not just PVs, with pvs -a.
-  Fix sync_dir() when no / in filename
-  vgcfgbackup -f accepts template with %s for VG name.
-  Extend hash functions to handle non-null-terminated data.
-  Add local activation support.
-  Tidy relative paths in makefile includes.
-  fsadm support for fsck and resizing - needs testing.
-  Add read-only GFS pool support.
-  Add lvm2create_initrd script from http://poochiereds.net/svn/lvm2/
-  Fix rounding of large diplayed sizes.
-  Suppress decimal point when using units of sectors/bytes.
-  Additional kernel target checks before pvmove & snapshot creation.
-  Add i2o_block.
-
-Version 2.00.16 - 24 May 2004
-=============================
-  Set area_count within alloc_lv_segment.
-  Remove error labels from lvresize.
-  Fix a pvs error path.
-  xxchange -ae for exclusive activation.
-  Don't return non-zero status if there aren't any volume groups.
-  Add --alloc argument to tools.
-  Rename allocation policies to contiguous, normal, anywhere, inherit.
-  nextfree becomes normal; anywhere isn't implemented yet.
-  LV inherits allocation policy from VG. Defaults: LV - inherit; VG - normal
-  Additional status character added to vgs to indicate allocation policy.
-  Add reset_fn to external_locking.
-  Ensure presence of virtual targets before attempting activating.
-  Attempt to fix resizing of snapshot origins.
-  Restructure lvresize, bringing it closer to lvcreate.
-  A quick sanity check on vg_disk struct when read in.  More checks needed.
-  Only include visible LVs in active/open counts.
-  Add virtual segment types, zero and error.  A large sparse device can be
-constructed as a writeable snapshot of a large zero segment.
-  Add --type to lvcreate/resize.
-  Push lv_create & alloc policy up to tool level.
-  Fix pvdisplay return code.
-  Detect invalid LV names in arg lists.
-  Reporting uses line-at-a-time output.
-  lvm2 format sets unlimited_vols format flag.
-  Internal-only metadata flag support.
-  Basic checking for presence of device-mapper targets.
-  Separate out polldaemon.
-  Revise internal locking semantics.
-  Move find_pv_by_name to library.
-  Rename move->copy.
-  Add devices to segments report.
-  Begin separating out segment code. There's a lot of change here.
-  Compress any (obsolete) long LVM1 pvids encountered.
-  Support for tagged config files.
-  Don't abort operations if selinux present but disabled.
-  Fix typo in configure which left HAVE_LIBDL unset.
-
-Version 2.00.15 - 19 Apr 2004
-=============================
-  configure --with-owner= --with-group= to avoid -o and -g args to 'install'
-
-Version 2.00.14 - 16 Apr 2004
-=============================
-  Use 64-bit file functions by default.
-
-Version 2.00.13 - 16 Apr 2004
-=============================
-  Set devices/md_component_detection = 1 to ignore devices containing md
-  superblocks. [Luca Berra]
-  Ignore error setting selinux file context if fs doesn't support it.
-
-Version 2.00.12 - 14 Apr 2004
-=============================
-  Install a default lvm.conf into /etc/lvm if there isn't one already.
-  Allow different installation dir for lvm.static (configure --staticdir=)
-  Fix inverted selinux error check.
-  Recognise power2 in /proc/devices.
-  Fix counting in lvs_in_vg_opened. [It ignored devices open more than once.]
-
-Version 2.00.11 - 8 Apr 2004
-============================
-  Set fallback_to_lvm1 in lvm.conf (or configure --enable-lvm1_fallback)
-  to run lvm1 binaries if running a 2.4 kernel without device-mapper.
-
-Version 2.00.10 - 7 Apr 2004
-============================
-  More fixes for static build.
-  Add basic selinux support.
-  Fix sysfs detection.
-
-Version 2.00.09 - 31 Mar 2004
-=============================
-  Update copyright notices for Red Hat.
-  Fix vgmknodes to remove dud /dev/mapper entries. (libdevmapper update reqd).
-  Add LVM1-style colon output to vgdisplay.
-  lvchange --refresh to reload active LVs.
-  Add string display to memory leak dump.
-  Add locking flags & memlock option.
-  Add list_versions to library.
-  Ignore open hidden LVs when checking if deactivation is OK.
-  Suppress move percentage when device inactive.
-  Add lv_info_by_lvid.
-  Various tidy-ups to the build process.
-  Rebaseline internal verbose level.
-  Add --nolocking option for read operations if locking is failing.
-  Add option to compile into a library.
-  When compiled without libdevmapper, only print warning message once.
-  Fix lvreduce PV extent calculations.
-  Fix DESTDIR to work with configure path overrides.
-  Always use / as config file separator & rename internal config file variables.
-  Add support for tagging PV/VG/LVs and hosts.
-  Fix rare bug in recognition of long cmdline argument forms.
-  Add basic internationalisation infrastructure.
-  Don't recurse symlinked dirs such as /dev/fd on 2.6 kernels.
-  Update autoconf files.
-  Add sysfs block device filtering for 2.6 kernels.
-  Update refs for move to sources.redhat.com.
-
-Friday 14th November 2003
-=========================
-Some bug fixes & minor enhancements, including:
-  Backwards compatibility with LVM1 metadata improved.
-  Missing man pages written.
-  Tool error codes made more consistent.
-  vgmknodes written.
-  O_DIRECT can be turned off if it doesn't work in your kernel.
-  dumpconfig to display the active configuration file
-
-You need to update libdevmapper before using 'vgmknodes' or 'vgscan --mknodes'.
-If your root filesystem is on an LV, you should run one of those two
-commands to fix up the special files in /dev in your real root filesystem 
-after finishing with your initrd.  Also, remember you can use
-'vgchange --ignorelockingfailure' on your initrd if the tool fails because
-it can't write a lock file to a read-only filesystem.
-
-Wednesday 30th April 2003
-=========================
-A pvmove implementation is now available for the new metadata format.
-
-When running a command that allocates space (e.g. lvcreate), you can now
-restrict not only which disk(s) may be used but also the Physical Extents 
-on those disks.  e.g. lvcreate -L 10 vg1 /dev/hda6:1000-2000:3000-4000
-
-
-Monday 18th November 2002
-========================
-
-The new format of LVM metadata is ready for you to test!
-  We expect it to be more efficient and more robust than the original format.
-  It's more compact and supports transactional changes and replication.
-  Should things go wrong on a system, it's human-readable (and editable).
-
-Please report any problems you find to the mailing list, 
-linux-lvm@sistina.com.  The software has NOT yet been thoroughly
-tested and so quite possibly there'll still be some bugs in it.
-Be aware of the disclaimer in the COPYING file.
-
-While testing, we recommend turning logging on in the configuration file 
-to provide us with diagnostic information:
-  log {
-        file="/tmp/lvm2.log"
-	level=7
-	activation=1
-  }
-
-You should schedule regular backups of your configuration file and
-metadata backups and archives (normally kept under /etc/lvm).
-
-Please read docs/example.conf and "man lvm.conf" to find out more about 
-the configuration file.
-
-To convert an existing volume group called vg1 to the new format using
-the default settings, use "vgconvert -M2 vg1".  See "man vgconvert".
-
--M (or --metadatatype in its long form) is a new flag to indicate which
-format of metadata the command should use for anything it creates.
-Currently, the valid types are "lvm1" and "lvm2" and they can be
-abbreviated to "1" and "2" respectively.  The default value for this
-flag can be changed in the global section in the config file.
-
-Backwards-compatible support for the original LVM1 metadata format is
-maintained, but it can be moved into a shared library or removed
-completely with configure's --with-lvm1 option.
-
-Under LVM2, the basic unit of metadata is the volume group.  Different
-volume groups can use different formats of metadata - vg1 could use
-the original LVM1 format while vg2 used the new format - but you can't
-mix formats within a volume group.  So to add a PV to an LVM2-format
-volume group you must run "pvcreate -M2" on it, followed by "vgextend".
-
-With LVM2-format metadata, lvextend will let you specify striping
-parameters.  So an LV could consist of two or more "segments" - the
-first segment could have 3 stripes while the second segment has just 2.
-
-LVM2 maintains a backup of the current metadata for each volume group
-in /etc/lvm/backup, and puts copies of previous versions in
-/etc/lvm/archive.  "vgcfgbackup" and "vgcfgrestore" can be used to
-create and restore from these files.  If you fully understand what 
-you're doing, metadata can be changed by editing a copy of a current
-backup file and using vgcfgrestore to reload it.
-
-Please read the pvcreate man page for more information on the new
-format for metadata.
-
-All tools that can change things have a --test flag which can be used
-to check the effect  of a set of cmdline args without really making the
-changes.
-
-
-What's not finished?
-====================
-The internal cache.  If you turn on debugging output you'll see lots of
-repeated messages, many of which will eventually get optimised out.
-
---test sometimes causes a command to fail (e.g. vgconvert --test) even 
-though the real command would work: again, fixing this is waiting for 
-the work on the cache.
-
-Several of the tools do not yet contain the logic to handle full
-recovery: combinations of pvcreate and vgcfgrestore may sometimes be
-needed to restore metadata if a tool gets interrupted or crashes or
-finds something unexpected.  This applies particularly to tools that
-work on more than one volume group at once (e.g. vgsplit).
-
-Display output.  Some metadata information cannot yet be displayed.
-
-Recovery tools to salvage "lost" metadata directly from the disks:
-but we hope the new format will mean such tools are hardly ever needed!
-

WHATS_NEW_DM

@@ -1,205 +0,0 @@
-Version 1.02.09 - 15 Aug 2006
-==============================
-  Add --table argument to dmsetup for a one-line table.
-  Abort if errors are found during cmdline option processing.
-  Add lockfs indicator to debug output.
-
-Version 1.02.08 - 17 July 2006
-==============================
-  Append full patch to check in emails.
-  Avoid duplicate dmeventd subdir with 'make distclean'.
-  Update dmsetup man page.
-  Add --force to dmsetup remove* to load error target.
-  dmsetup remove_all also performs mknodes.
-  Don't suppress identical table reloads if permission changes.
-  Fix corelog segment line.
-  Suppress some compiler warnings.
-
-Version 1.02.07 - 11 May 2006
-=============================
-  Add DM_CORELOG flag to dm_tree_node_add_mirror_target().
-  Avoid a dmeventd compiler warning.
-
-Version 1.02.06 - 10 May 2006
-=============================
-  Move DEFS into configure.h.
-  Fix leaks in error paths found by coverity.
-  Remove dmsetup line buffer limitation.
-
-Version 1.02.05 - 19 Apr 2006
-=============================
-  Separate install_include target in makefiles.
-  Separate out DEFS from CFLAGS.
-  Support pkg-config.
-  Check for libsepol.
-
-Version 1.02.04 - 14 Apr 2006
-=============================
-  Bring dmsetup man page up-to-date.
-  Use name-based device refs if kernel doesn't support device number refs.
-  Fix memory leak (struct dm_ioctl) when struct dm_task is reused.
-  If _create_and_load_v4 fails part way through, revert the creation.
-  dmeventd thread/fifo fixes.
-  Add file & line to dm_strdup_aux().
-  Add setgeometry.
-
-Version 1.02.03 - 7 Feb 2006
-============================
-  Add exported functions to set uid, gid and mode.
-  Rename _log to dm_log and export.
-  Add dm_tree_skip_lockfs.
-  Fix dm_strdup debug definition.
-  Fix hash function to avoid using a negative array offset.
-  Don't inline _find in hash.c and tidy signed/unsigned etc.
-  Fix libdevmapper.h #endif.
-  Fix dmsetup version driver version.
-  Add sync, nosync and block_on_error mirror log parameters.
-  Add hweight32.
-  Fix dmeventd build.
-
-Version 1.02.02 - 2 Dec 2005
-============================
-  dmeventd added.
-  Export dm_task_update_nodes.
-  Use names instead of numbers in messages when ioctls fail.
-
-Version 1.02.01 - 23 Nov 2005
-=============================
-  Resume snapshot-origins last.
-  Drop leading zeros from dm_format_dev.
-  Suppress attempt to reload identical table.
-  Additional LVM- prefix matching for transitional period.
-
-Version 1.02.00 - 10 Nov 2005
-=============================
-  Added activation functions to library.
-  Added return macros.
-  Also suppress error if device doesn't exist with DM_DEVICE_STATUS.
-  Export dm_set_selinux_context().
-  Add dm_driver_version().
-  Added dependency tree functions to library.
-  Added hash, bitset, pool, dbg_malloc to library.
-  Added ls --tree to dmsetup.
-  Added dmsetup --nolockfs support for suspend/reload.
-
-Version 1.01.05 - 26 Sep 2005
-=============================
-  Resync list.h with LVM2.
-  Remember increased buffer size and use for subsequent calls.
-  On 'buffer full' condition, double buffer size and repeat ioctl.
-  Fix termination of getopt_long() option array.
-  Report 'buffer full' condition with v4 ioctl as well as with v1.
-
-Version 1.01.04 - 2 Aug 2005
-============================
-  Fix dmsetup ls -j and status --target with empty table.
-
-Version 1.01.03 - 13 Jun 2005
-=============================
-  Use matchpathcon mode parameter.
-  Fix configure script to re-enable selinux.
-
-Version 1.01.02 - 17 May 2005
-=============================
-  Call dm_lib_exit() and dm_lib_release() automatically now.
-  Add --target <target_type> filter to dmsetup table/status/ls.
-  Add --exec <command> to dmsetup ls.
-  Fix dmsetup getopt_long usage.
-
-Version 1.01.01 - 29 Mar 2005
-=============================
-  Update dmsetup man page.
-  Drop-in devmap_name replacement.
-  Add option to compile without ioctl for testing.
-  Fix DM_LIB_VERSION sed.
-
-Version 1.01.00 - 17 Jan 2005
-=============================
-  Add dm_task_no_open_count() to skip getting open_count.
-
-Version 1.00.21 - 7 Jan 2005
-============================
-  Fix /proc/devices parsing.
-
-Version 1.00.20 - 6 Jan 2005
-============================
-  Attempt to fix /dev/mapper/control transparently if it's wrong.
-  Configuration-time option for setting uid/gid/mode for /dev/mapper nodes.
-  Update kernel patches for 2.4.27/2.4.28-pre-4 (includes minor fixes).
-  Add --noheadings columns option for colon-separated dmsetup output.
-  Support device referencing by uuid or major/minor.
-  Warn if kernel data didn't fit in buffer.
-  Fix a printf.
-
-Version 1.00.19 - 3 July 2004
-=============================
-  More autoconf fixes.
-  Fix a dmsetup newline.
-  Fix device number handling for 2.6 kernels.
-
-Version 1.00.18 - 20 Jun 2004
-=============================
-  Fix a uuid free in libdm-iface.
-  Fix a targets string size calc in driver.
-  Add -c to dmsetup for column-based output.
-  Add target message-passing ioctl.
-
-Version 1.00.17 - 17 Apr 2004
-=============================
-  configure --with-owner= --with-group= to avoid -o and -g args to 'install'
-  Fix library selinux linking.
-
-Version 1.00.16 - 16 Apr 2004
-=============================
-  Ignore error setting selinux file context if fs doesn't support it.
-
-Version 1.00.15 - 7 Apr 2004
-============================
-  Fix status overflow check in kernel patches.
-
-Version 1.00.14 - 6 Apr 2004
-============================
-  Fix static selinux build.
-
-Version 1.00.13 - 6 Apr 2004
-============================
-  Add some basic selinux support.
-
-Version 1.00.12 - 6 Apr 2004
-============================
-  Fix dmsetup.static install.
-
-Version 1.00.11 - 5 Apr 2004
-============================
-  configure --enable-static_link does static build in addition to dynamic.
-  Moved Makefile library targets definition into template.
-
-Version 1.00.10 - 2 Apr 2004
-============================
-  Fix DESTDIR handling.
-  Static build installs to dmsetup.static.
-  Basic support for internationalisation.
-  Minor Makefile tidy-ups/fixes.
-
-Version 1.00.09 - 31 Mar 2004
-=============================
-  Update copyright notices to Red Hat.
-  Move full mknodes functionality from dmsetup into libdevmapper.
-  Avoid sscanf %as for uClibc compatibility.
-  Cope if DM_LIST_VERSIONS is not defined.
-  Add DM_LIST_VERSIONS functionality to kernel patches.
-  Generate new kernel patches for 2.4.26-rc1.
-
-Version 1.00.08 - 27 Feb 2004
-=============================
-  Added 'dmsetup targets'.
-  Added event_nr support to 'dmsetup wait'.
-  Updated dmsetup man page.
-  Allow logging function to be reset to use internal one.
-  Bring log macros in line with LVM2 ones.
-  Added 'make install_static_lib' which installs libdevmapper.a.
-  Made configure/makefiles closer to LVM2 versions.
-  Fixed DESTDIR for make install/install_static_lib.
-  Updated README/INSTALL to reflect move to sources.redhat.com.
-  Updated autoconf files to 2003-06-17.
-

autoconf/config.sub

@@ -1,10 +1,6 @@
 #! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2003-06-17'
-
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -29,9 +25,6 @@ timestamp='2003-06-17'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -52,73 +45,30 @@ timestamp='2003-06-17'
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
-me=`echo "$0" | sed -e 's,.*/,,'`
+if [ x$1 = x ]
+then
+	echo Configuration name missing. 1>&2
+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+	echo "or     $0 ALIAS" 1>&2
+	echo where ALIAS is a recognized configuration type. 1>&2
+	exit 1
+fi
 
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
+# First pass through any local machine types.
+case $1 in
+	*local*)
+		echo $1
+		exit 0
+		;;
+	*)
+	;;
 esac
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  linux-gnu*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -144,7 +94,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple)
 		os=
 		basic_machine=$1
 		;;
@@ -155,17 +105,9 @@ case $os in
 	-scout)
 		;;
 	-wrs)
-		os=-vxworks
+		os=vxworks
 		basic_machine=$1
 		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -214,72 +156,33 @@ case $os in
 	-psos*)
 		os=-psos
 		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| msp430 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+		| 580 | i960 | h8300 \
+		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+		| mips64vr5000 | miprs64vr5000el | mcore \
+		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+		| thumb | d10v)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
 		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
+	i[34567]86)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -288,60 +191,24 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
+	# FIXME: clean up the formatting here.
+	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+	      | xmp-* | ymp-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+	      | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-* \
+	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+	      | mipstx39-* | mipstx39el-* | mcore-* \
+	      | f301-* | armv*-* | t3e-* \
+	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -373,22 +240,19 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
 		;;
 	amiga | amiga-*)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		;;
 	amigaos | amigados)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		os=-amigaos
 		;;
 	amigaunix | amix)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		os=-sysv4
 		;;
 	apollo68)
@@ -407,10 +271,6 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -431,30 +291,27 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | j90)
-		basic_machine=j90-cray
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[ctj]90-cray)
+		basic_machine=c90-cray
 		os=-unicos
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -496,10 +353,6 @@ case $basic_machine in
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -573,21 +426,22 @@ case $basic_machine in
 		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
+		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
+	i[34567]86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i*86v4*)
+	i[34567]86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i*86v)
+	i[34567]86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i*86sol2)
+	i[34567]86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -599,6 +453,14 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
+	i386-go32 | go32)
+		basic_machine=i386-unknown
+		os=-go32
+		;;
+	i386-mingw32 | mingw32)
+		basic_machine=i386-unknown
+		os=-mingw32
+		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -624,43 +486,35 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+	*mint | *MiNT)
 		basic_machine=m68k-atari
 		os=-mint
 		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
 	msdos)
-		basic_machine=i386-pc
+		basic_machine=i386-unknown
 		os=-msdos
 		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -670,7 +524,7 @@ case $basic_machine in
 		os=-netbsd
 		;;
 	netwinder)
-		basic_machine=armv4l-rebel
+		basic_machine=armv4l-corel
 		os=-linux
 		;;
 	news | news700 | news800 | news900)
@@ -718,28 +572,13 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-mon960
 		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -762,65 +601,45 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-	pc532 | pc532-*)
+        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
+	pentium | p5 | k5 | k6 | nexen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+	pentiumpro | p6 | 6x86)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
+	pentiumii | pentium2)
 		basic_machine=i786-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+	pentium-* | p5-* | k5-* | k6-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+	pentiumpro-* | p6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
+	pentiumii-* | pentium2-*)
 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)	basic_machine=power-ibm
+	power)	basic_machine=rs6000-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-		;;
+	        ;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-		;;
+	        ;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -831,26 +650,10 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -858,10 +661,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
+	sparclite-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -919,44 +719,20 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=alphaev5-cray
+		basic_machine=t3e-cray
 		os=-unicos
 		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -981,8 +757,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
+               basic_machine=f301-fujitsu
+               ;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -1003,13 +779,13 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
+	xmp)
+		basic_machine=xmp-cray
 		os=-unicos
 		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -1030,6 +806,13 @@ case $basic_machine in
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
+	mips)
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
+		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
@@ -1039,26 +822,16 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv9)
 		basic_machine=sparc-sun
 		;;
-	cydra)
+        cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -1073,8 +846,9 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
+	c4x*)
+		basic_machine=c4x-none
+		os=-coff
 		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -1132,34 +906,14 @@ case $os in
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
@@ -1173,12 +927,6 @@ case $os in
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -1194,23 +942,14 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
-	-atheos*)
-		os=-atheos
-		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
 	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
+	        os=-nextstep2
 		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
@@ -1246,14 +985,8 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
+        -*mint | -*MiNT)
+	        os=-mint
 		;;
 	-none)
 		;;
@@ -1280,20 +1013,13 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-rebel)
+	arm*-corel)
 		os=-linux
 		;;
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
+        pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1320,9 +1046,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or32-*)
-		os=-coff
-		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1386,25 +1109,25 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-	*-gould)
+        *-gould)
 		os=-sysv
 		;;
-	*-highlevel)
+        *-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-	*-sgi)
+        *-sgi)
 		os=-irix
 		;;
-	*-siemens)
+        *-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
 		os=-rtu
 		;;
-	f30[01]-fujitsu | f700-fujitsu)
+	f301-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
@@ -1464,13 +1187,13 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
-			-mvs* | -opened*)
+			-mvs*)
 				vendor=ibm
 				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks* | -windiss*)
+			-vxsim* | -vxworks*)
 				vendor=wrs
 				;;
 			-aux*)
@@ -1482,23 +1205,12 @@ case $basic_machine in
 			-mpw* | -macos*)
 				vendor=apple
 				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+			-*mint | -*MiNT)
 				vendor=atari
 				;;
-			-vos*)
-				vendor=stratus
-				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
 
 echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

autoconf/install-sh

@@ -1,38 +1,19 @@
 #!/bin/sh
+#
 # install - install a program, script, or datafile
-
-scriptversion=2003-06-13.21
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
+# This comes from X11R5 (mit/util/scripts/install.sh).
 #
-# Copyright (C) 1994 X Consortium
+# Copyright 1991 by the Massachusetts Institute of Technology
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
@@ -42,11 +23,13 @@ scriptversion=2003-06-13.21
 # from scratch.  It can only install one file at a time, a restriction
 # shared with many OS's install programs.
 
+
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 
+
 # put in absolute paths if you don't have them in your path; or use env. vars.
 
 mvprog="${MVPROG-mv}"
@@ -58,229 +41,211 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-transformbasename=
-transform_arg=
+transformbasename=""
+transform_arg=""
 instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
-chowncmd=
-chgrpcmd=
-stripcmd=
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
 rmcmd="$rmprog -f"
 mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
+src=""
+dst=""
+dir_arg=""
 
-usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
-   or: $0 -d DIR1 DIR2...
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
 
-In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
-In the second, create the directory path DIR.
+	-d) dir_arg=true
+	    shift
+	    continue;;
 
-Options:
--b=TRANSFORMBASENAME
--c         copy source (using $cpprog) instead of moving (using $mvprog).
--d         create directories instead of installing files.
--g GROUP   $chgrp installed files to GROUP.
--m MODE    $chmod installed files to MODE.
--o USER    $chown installed files to USER.
--s         strip installed files (using $stripprog).
--t=TRANSFORM
---help     display this help and exit.
---version  display version info and exit.
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
 
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
 
-while test -n "$1"; do
-  case $1 in
-    -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-        shift
-        continue;;
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
 
-    -c) instcmd=$cpprog
-        shift
-        continue;;
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
 
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
 
-    --help) echo "$usage"; exit 0;;
-
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-        shift
-        continue;;
-
-    --version) echo "$0 $scriptversion"; exit 0;;
-
-    *)  if test -z "$src"; then
-          src=$1
-        else
-          # this colon is to work around a 386BSD /bin/sh bug
-          :
-          dst=$1
-        fi
-        shift
-        continue;;
-  esac
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
 done
 
-if test -z "$src"; then
-  echo "$0: no input file specified." >&2
-  exit 1
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	true
 fi
 
-if test -n "$dir_arg"; then
-  dst=$src
-  src=
-
-  if test -d "$dst"; then
-    instcmd=:
-    chmodcmd=
-  else
-    instcmd=$mkdirprog
-  fi
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+		chmodcmd=""
+	else
+		instcmd=mkdir
+	fi
 else
-  # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-  # might cause directories to be created, which would be especially bad
-  # if $src (and thus $dsttmp) contains '*'.
-  if test ! -f "$src" && test ! -d "$src"; then
-    echo "$0: $src does not exist." >&2
-    exit 1
-  fi
 
-  if test -z "$dst"; then
-    echo "$0: no destination specified." >&2
-    exit 1
-  fi
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
 
-  # If destination is a directory, append the input filename; won't work
-  # if double slashes aren't ignored.
-  if test -d "$dst"; then
-    dst=$dst/`basename "$src"`
-  fi
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
 fi
 
 ## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Make sure that the destination directory exists.
-# (this part is taken from Noah Friedman's mkinstalldirs script.)
+#  this part is taken from Noah Friedman's mkinstalldirs script
 
 # Skip lots of stat calls in the usual case.
-if test ! -d "$dstdir"; then
-  defaultIFS='
-	'
-  IFS="${IFS-$defaultIFS}"
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
 
-  oIFS=$IFS
-  # Some sh's can't handle IFS=/ for some reason.
-  IFS='%'
-  set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-  IFS=$oIFS
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
 
-  pathcomp=
+pathcomp=''
 
-  while test $# -ne 0 ; do
-    pathcomp=$pathcomp$1
-    shift
-    test -d "$pathcomp" || $mkdirprog "$pathcomp"
-    pathcomp=$pathcomp/
-  done
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
+done
 fi
 
-if test -n "$dir_arg"; then
-  $doit $instcmd "$dst" \
-    && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-    && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-    && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-    && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
 
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
 else
-  # If we're going to rename the final executable, determine the name now.
-  if test -z "$transformarg"; then
-    dstfile=`basename "$dst"`
-  else
-    dstfile=`basename "$dst" $transformbasename \
-             | sed $transformarg`$transformbasename
-  fi
 
-  # don't allow the sed command to completely eliminate the filename.
-  test -z "$dstfile" && dstfile=`basename "$dst"`
+# If we're going to rename the final executable, determine the name now.
 
-  # Make a couple of temp file names in the proper directory.
-  dsttmp=$dstdir/_inst.$$_
-  rmtmp=$dstdir/_rm.$$_
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
 
-  # Trap to clean up those temp files at exit.
-  trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-  trap '(exit $?); exit' 1 2 13 15
+# don't allow the sed command to completely eliminate the filename
 
-  # Move or copy the file name to the temp name
-  $doit $instcmd "$src" "$dsttmp" &&
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
 
-  # and set any options; do chmod last to preserve setuid bits.
-  #
-  # If any of these fail, we abort the whole thing.  If we want to
-  # ignore errors from any of these, just make sure not to ignore
-  # errors from the above "$doit $instcmd $src $dsttmp" command.
-  #
-  { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-    && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-    && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-    && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+# Make a temp file name in the proper directory.
 
-  # Now remove or move aside any old file at destination location.  We
-  # try this two ways since rm can't unlink itself on some systems and
-  # the destination file might be busy for other reasons.  In this case,
-  # the final cleanup might fail but the new file should still install
-  # successfully.
-  {
-    if test -f "$dstdir/$dstfile"; then
-      $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-      || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-      || {
-	  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-	  (exit 1); exit
-      }
-    else
-      :
-    fi
-  } &&
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
 
-  # Now rename the file to the real destination.
-  $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 fi &&
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit
-}
 
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
+exit 0

configure.in

@@ -1,399 +1,94 @@
+################################################################################
 ##
-## Copyright (C) 2000-2004 Sistina Software, Inc. All rights reserved.
-## Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+##    Copyright 1999-2000 Sistina Software, Inc.
 ##
-## This file is part of the LVM2.
+##    This is free software released under the GNU General Public License.
+##    There is no warranty for this software.  See the file COPYING for
+##    details.
 ##
-## This copyrighted material is made available to anyone wishing to use,
-## modify, copy, or redistribute it subject to the terms and conditions
-## of the GNU General Public License v.2.
+##    See the file CONTRIBUTORS for a list of contributors.
 ##
-## 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
+##    This file is maintained by:
+##      AJ Lewis <lewis@sistina.com>
+## 
+##    File name: configure.in
+##
+##    Description: Input file for autoconf.  Generates the configure script 
+##                 that tries to keep everything nice and portable.  It also
+##                 simplifies distribution package building considerably.
 ################################################################################
 
-AC_PREREQ(2.53)
-################################################################################
-dnl -- Process this file with autoconf to produce a configure script.
+dnl Process this file with autoconf to produce a configure script.
 AC_INIT(lib/device/dev-cache.h)
 
-################################################################################
-AC_CONFIG_HEADERS(lib/misc/configure.h)
-
-################################################################################
-dnl -- Setup the directory where autoconf has auxilary files
+dnl setup the directory where autoconf has auxilary files
 AC_CONFIG_AUX_DIR(autoconf) 
 
-################################################################################
-dnl -- Get system type
-AC_CANONICAL_SYSTEM
-
-case "$host_os" in
-	linux*)
-		CFLAGS="$CFLAGS"
-		COPTIMISE_FLAG="-O2"
-		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
-		CLDWHOLEARCHIVE="-Wl,-whole-archive"
-		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
-		LDDEPS="$LDDEPS .export.sym"
-		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-		LIB_SUFFIX="so"
-		DEVMAPPER=yes
-		ODIRECT=yes
-		SELINUX=yes
-		CLUSTER=internal
-		FSADM=no ;;
-	darwin*)
-		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
-		COPTIMISE_FLAG="-O2"
-		CLDFLAGS="$CLDFLAGS"
-		CLDWHOLEARCHIVE="-all_load"
-		CLDNOWHOLEARCHIVE=
-		LDDEPS="$LDDEPS"
-		LDFLAGS="$LDFLAGS"
-		LIB_SUFFIX="dylib"
-		DEVMAPPER=yes
-		ODIRECT=no
-		SELINUX=no
-		CLUSTER=none
-		FSADM=no ;;
-esac
-
-################################################################################
-dnl -- Checks for programs.
+dnl Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
-AC_PATH_PROG(CFLOW_CMD, cflow)
-AC_PATH_PROG(CSCOPE_CMD, cscope)
 
-################################################################################
-dnl -- Checks for header files.
+dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_HEADER_TIME
+AC_CHECK_HEADERS(fcntl.h malloc.h sys/ioctl.h unistd.h)
 
-AC_CHECK_HEADERS(fcntl.h limits.h locale.h stddef.h syslog.h sys/file.h sys/ioctl.h sys/param.h sys/time.h,,AC_MSG_ERROR(bailing out))
-AC_CHECK_HEADERS(assert.h ctype.h libgen.h signal.h stdio.h sys/mman.h sys/resource.h sys/stat.h sys/types.h sys/utsname.h sys/wait.h time.h,,AC_MSG_ERROR(bailing out))
-
-case "$host_os" in
-	linux*)
-		AC_CHECK_HEADERS(asm/byteorder.h linux/fs.h malloc.h,,AC_MSG_ERROR(bailing out)) ;;
-	darwin*)
-		AC_CHECK_HEADERS(machine/endian.h sys/disk.h,,AC_MSG_ERROR(bailing out)) ;;
-esac
-
-################################################################################
-dnl -- Checks for typedefs, structures, and compiler characteristics.
+dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_TYPE_MODE_T
 AC_STRUCT_ST_RDEV
-AC_STRUCT_TM
+AC_HEADER_TIME
 
-################################################################################
-dnl -- Check for functions
-AC_CHECK_FUNCS(gethostname getpagesize memset munmap setlocale strcasecmp strchr strdup strncasecmp strerror strrchr strstr strtol strtoul,,AC_MSG_ERROR(bailing out))
-AC_FUNC_ALLOCA
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_FORK
-AC_FUNC_LSTAT
-AC_FUNC_MALLOC
-AC_FUNC_MEMCMP
-AC_FUNC_MMAP
-AC_FUNC_STAT
-AC_FUNC_STRTOD
-
-################################################################################
-dnl -- Prefix is /usr by default, the exec_prefix default is setup later
+dnl -- prefix is /usr by default, the exec_prefix default is setup later
 AC_PREFIX_DEFAULT(/usr)
 
-################################################################################
-dnl -- Parallel make jobs?
-AC_ARG_ENABLE(jobs, [  --enable-jobs=NUM       Number of jobs to run simultaneously], JOBS=-j$enableval, JOBS=-j2)
-
-################################################################################
-dnl -- Setup the ownership of the files
-AC_MSG_CHECKING(file owner)
-OWNER="root"
-
+dnl -- setup the ownership of the files
 AC_ARG_WITH(user,
   [  --with-user=USER        Set the owner of installed files ],
-  [ OWNER="$withval" ])
-AC_MSG_RESULT($OWNER)
+  [ OWNER="$withval" ],
+  [ OWNER="root" ])
 
-if test x$OWNER != x; then
-	OWNER="-o $OWNER"
-fi
-
-################################################################################
-dnl -- Setup the group ownership of the files
-AC_MSG_CHECKING(group owner)
-GROUP="root"
+dnl -- setup the group ownership of the files
 AC_ARG_WITH(group,
   [  --with-group=GROUP      Set the group owner of installed files ],
-  [ GROUP="$withval" ])
-AC_MSG_RESULT($GROUP)
+  [ GROUP="$withval" ],
+  [ GROUP="root" ])
 
-if test x$GROUP != x; then
-	GROUP="-g $GROUP"
-fi
+dnl -- Where the linux src tree is
+AC_ARG_WITH(kernel_dir,
+  [  --with-kernel_dir=DIR   linux kernel source in DIR [/usr/src/linux]],
+  [ kernel_dir="$withval" ],
+  [ kernel_dir=/usr/src/linux ])
 
-################################################################################
-dnl -- LVM1 tool fallback option
-AC_MSG_CHECKING(whether to enable lvm1 fallback)
-AC_ARG_ENABLE(lvm1_fallback, [  --enable-lvm1_fallback  Use this to fall back and use LVM1 binaries if
-                          device-mapper is missing from the kernel],  LVM1_FALLBACK=$enableval, LVM1_FALLBACK=no)
-AC_MSG_RESULT($LVM1_FALLBACK)
+AC_ARG_ENABLE(jobs, [  --enable-jobs=NUM       Number of jobs to run simultaneously], JOBS=-j$enableval, JOBS=)
 
-if test x$LVM1_FALLBACK = xyes; then
-	AC_DEFINE([LVM1_FALLBACK], 1, [Define to 1 if 'lvm' should fall back to using LVM1 binaries if device-mapper is missing from the kernel])
-fi
-
-################################################################################
-dnl -- format1 inclusion type
-AC_MSG_CHECKING(whether to include support for lvm1 metadata)
-AC_ARG_WITH(lvm1,
-  [  --with-lvm1=TYPE        LVM1 metadata support: internal/shared/none
-                          [TYPE=internal] ],
-  [ LVM1="$withval" ],
-  [ LVM1="internal" ])
-AC_MSG_RESULT($LVM1)
-
-if [[ "x$LVM1" != xnone -a "x$LVM1" != xinternal -a "x$LVM1" != xshared ]];
- then  AC_MSG_ERROR(
---with-lvm1 parameter invalid
-)
-fi;
-
-if test x$LVM1 = xinternal; then
-	AC_DEFINE([LVM1_INTERNAL], 1, [Define to 1 to include built-in support for LVM1 metadata.])
-fi
-
-################################################################################
-dnl -- format_pool inclusion type
-AC_MSG_CHECKING(whether to include support for GFS pool metadata)
-AC_ARG_WITH(pool,
-  [  --with-pool=TYPE        GFS pool read-only support: internal/shared/none
-                          [TYPE=internal] ],
-  [ POOL="$withval" ],
-  [ POOL="internal" ])
-AC_MSG_RESULT($POOL)
-
-if [[ "x$POOL" != xnone -a "x$POOL" != xinternal -a "x$POOL" != xshared ]];
- then  AC_MSG_ERROR(
---with-pool parameter invalid
-)
-fi;
-
-if test x$POOL = xinternal; then
-	AC_DEFINE([POOL_INTERNAL], 1, [Define to 1 to include built-in support for GFS pool metadata.])
-fi
-
-################################################################################
-dnl -- cluster_locking inclusion type
-AC_MSG_CHECKING(whether to include support for cluster locking)
-AC_ARG_WITH(cluster,
-  [  --with-cluster=TYPE     Cluster LVM locking support: internal/shared/none
-                          [TYPE=internal] ],
-  [ CLUSTER="$withval" ])
-AC_MSG_RESULT($CLUSTER)
-
-if [[ "x$CLUSTER" != xnone -a "x$CLUSTER" != xinternal -a "x$CLUSTER" != xshared ]];
- then  AC_MSG_ERROR(
---with-cluster parameter invalid
-)
-fi;
-
-if test x$CLUSTER = xinternal; then
-	AC_DEFINE([CLUSTER_LOCKING_INTERNAL], 1, [Define to 1 to include built-in support for clustered LVM locking.])
-fi
-
-################################################################################
-dnl -- snapshots inclusion type
-AC_MSG_CHECKING(whether to include snapshots)
-AC_ARG_WITH(snapshots,
-  [  --with-snapshots=TYPE   Snapshot support: internal/shared/none
-                          [TYPE=internal] ],
-  [ SNAPSHOTS="$withval" ],
-  [ SNAPSHOTS="internal" ])
-AC_MSG_RESULT($SNAPSHOTS)
-
-if [[ "x$SNAPSHOTS" != xnone -a "x$SNAPSHOTS" != xinternal -a "x$SNAPSHOTS" != xshared ]];
- then  AC_MSG_ERROR(
---with-snapshots parameter invalid
-)
-fi;
-
-if test x$SNAPSHOTS = xinternal; then
-	AC_DEFINE([SNAPSHOT_INTERNAL], 1, [Define to 1 to include built-in support for snapshots.])
-fi
-
-################################################################################
-dnl -- mirrors inclusion type
-AC_MSG_CHECKING(whether to include mirrors)
-AC_ARG_WITH(mirrors,
-  [  --with-mirrors=TYPE     Mirror support: internal/shared/none
-                          [TYPE=internal] ],
-  [ MIRRORS="$withval" ],
-  [ MIRRORS="internal" ])
-AC_MSG_RESULT($MIRRORS)
-
-if [[ "x$MIRRORS" != xnone -a "x$MIRRORS" != xinternal -a "x$MIRRORS" != xshared ]];
- then  AC_MSG_ERROR(
---with-mirrors parameter invalid
-)
-fi;
-
-if test x$MIRRORS = xinternal; then
-	AC_DEFINE([MIRRORED_INTERNAL], 1, [Define to 1 to include built-in support for mirrors.])
-fi
-
-################################################################################
-dnl -- Enables staticly-linked tools
-AC_MSG_CHECKING(whether to use static linking)
-AC_ARG_ENABLE(static_link, [  --enable-static_link    Use this to link the tools to their libraries
+dnl Enables staticly linked tools
+AC_ARG_ENABLE(static_link, [  --enable-static_link    Use this to link the tools to the liblvm library
                           statically.  Default is dynamic linking],  STATIC_LINK=$enableval, STATIC_LINK=no)
-AC_MSG_RESULT($STATIC_LINK)
 
-################################################################################
-dnl -- Enable readline
-AC_MSG_CHECKING(whether to enable readline)
-AC_ARG_ENABLE(readline, [  --enable-readline       Enable readline support],
-READLINE=$enableval, READLINE=no)
-AC_MSG_RESULT($READLINE)
+dnl Disable readline
+AC_ARG_ENABLE(readline, [  --disable-readline      Disable readline support],  \
+READLINE=$enableval, READLINE=yes)
 
-if test x$READLINE = xyes; then
-	AC_DEFINE([READLINE_SUPPORT], 1, [Define to 1 to include the LVM readline shell.])
-fi
-
-################################################################################
-dnl -- Disable selinux
-AC_MSG_CHECKING(whether to enable selinux support)
-AC_ARG_ENABLE(selinux, [  --disable-selinux       Disable selinux support],
-SELINUX=$enableval)
-AC_MSG_RESULT($SELINUX)
-
-################################################################################
-dnl -- Build cluster LVM daemon
-AC_MSG_CHECKING(whether to build cluster LVM daemon)
-AC_ARG_WITH(clvmd,
-  [  --with-clvmd=TYPE       Build cluster LVM Daemon: cman/gulm/none/all
-                          [TYPE=none] ],
-  [ CLVMD="$withval" ],
-  [ CLVMD="none" ])
-if test x$CLVMD = xyes; then
-	CLVMD=all
-fi
-AC_MSG_RESULT($CLVMD)
-
-dnl -- If clvmd enabled without cluster locking, automagically include it
-if  test x$CLVMD != xnone && test x$CLUSTER = xnone; then
-	CLUSTER=internal
-fi
-
-################################################################################
-dnl -- Enable debugging
-AC_MSG_CHECKING(whether to enable debugging)
-AC_ARG_ENABLE(debug,    [  --enable-debug          Enable debugging],
-DEBUG=$enableval, DEBUG=no)
-AC_MSG_RESULT($DEBUG)
-
-dnl -- Normally turn off optimisation for debug builds
-if test x$DEBUG = xyes; then
-	COPTIMISE_FLAG=
-else
-	CSCOPE_CMD=
-fi
-
-################################################################################
-dnl -- Override optimisation
-AC_MSG_CHECKING(for C optimisation flag)
-AC_ARG_WITH(optimisation,
-  [  --with-optimisation=OPT C optimisation flag [OPT=-O2] ],
-  [ COPTIMISE_FLAG="$withval" ])
-AC_MSG_RESULT($COPTIMISE_FLAG)
-
-################################################################################
-dnl -- Disable devmapper
-AC_MSG_CHECKING(whether to use device-mapper)
-AC_ARG_ENABLE(devmapper, [  --disable-devmapper     Disable device-mapper interaction],
-DEVMAPPER=$enableval)
-AC_MSG_RESULT($DEVMAPPER)
-
-if test x$DEVMAPPER = xyes; then
-	AC_DEFINE([DEVMAPPER_SUPPORT], 1, [Define to 1 to enable device-mapper interaction.])
-fi
-
-################################################################################
-dnl -- Disable O_DIRECT
-AC_MSG_CHECKING(whether to enable O_DIRECT)
-AC_ARG_ENABLE(o_direct, [  --disable-o_direct      Disable O_DIRECT],
-ODIRECT=$enableval)
-AC_MSG_RESULT($ODIRECT)
-
-if test x$ODIRECT = xyes; then
-	AC_DEFINE([O_DIRECT_SUPPORT], 1, [Define to 1 to enable O_DIRECT support.])
-fi
-
-################################################################################
-dnl -- Enable cmdlib
-AC_MSG_CHECKING(whether to compile liblvm2cmd.so)
-AC_ARG_ENABLE(cmdlib, [  --enable-cmdlib         Build shared command library],
-CMDLIB=$enableval, CMDLIB=no)
-AC_MSG_RESULT($CMDLIB)
-
-if test x$CMDLIB = xyes; then
-	AC_DEFINE([CMDLIB], 1, [Define to 1 to build the shared command library.])
-fi
-
-################################################################################
-dnl -- Enable fsadm
-AC_MSG_CHECKING(whether to build fsadm)
-AC_ARG_ENABLE(fsadm, [  --enable-fsadm          Enable fsadm],
-FSADM=$enableval)
-AC_MSG_RESULT($FSADM)
-
-################################################################################
-dnl -- enable dmeventd handling
-AC_MSG_CHECKING(whether to use dmeventd)
-AC_ARG_ENABLE(dmeventd, [  --enable-dmeventd       Enable the device-mapper event daemon],
-DMEVENTD=$enableval)
-AC_MSG_RESULT($DMEVENTD)
-
-dnl -- dmeventd currently requires internal mirror support
-if test x$DMEVENTD = xyes && test x$MIRRORS != xinternal; then
-AC_MSG_ERROR(
---enable-dmeventd currently requires --with-mirrors=internal
-)
-fi
-
-if test x$DMEVENTD = xyes; then
-	AC_DEFINE([DMEVENTD], 1, [Define to 1 to enable the device-mapper event daemon.])
-fi
-################################################################################
-dnl -- Mess with default exec_prefix
+dnl Mess with default exec_prefix
 if [[ "x$exec_prefix" = xNONE -a "x$prefix" = xNONE ]];
  then  exec_prefix="";
 fi;
 
-################################################################################
-dnl -- Checks for library functions.
+dnl Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(mkdir rmdir uname,,AC_MSG_ERROR(bailing out))
+AC_CHECK_FUNCS(mkdir rmdir uname)
 
-################################################################################
-dnl -- Check for termcap (Shamelessly copied from parted 1.4.17)
+dnl check for termcap (Shamelessly copied from parted 1.4.17)
 if test x$READLINE = xyes; then
 	AC_SEARCH_LIBS(tgetent, ncurses curses termcap termlib, ,
 		AC_MSG_ERROR(
@@ -406,59 +101,11 @@ Note: if you are using precompiled packages you will also need the development
 Note: (n)curses also seems to work as a substitute for termcap.  This was
   not found either - but you could try installing that as well.
 )
+	exit
 	)
 fi
 
-################################################################################
-dnl -- Check for dlopen
-AC_CHECK_LIB(dl, dlopen, HAVE_LIBDL=yes, HAVE_LIBDL=no)
-
-if [[ "x$HAVE_LIBDL" = xyes ]]; then
-	AC_DEFINE([HAVE_LIBDL], 1, [Define to 1 if dynamic libraries are available.])
-	LIBS="-ldl $LIBS"
-else
-	HAVE_LIBDL=no
-fi
-
-################################################################################
-dnl -- Check for shared/static conflicts
-if [[ \( "x$LVM1" = xshared -o "x$POOL" = xshared -o "x$CLUSTER" = xshared \
-      -o "x$SNAPSHOTS" = xshared -o "x$MIRRORS" = xshared \
-      \) -a "x$STATIC_LINK" = xyes ]];
- then  AC_MSG_ERROR(
-Features cannot be 'shared' when building statically
-)
-fi
-
-################################################################################
-dnl -- Check for selinux
-if test x$SELINUX = xyes; then
-	AC_MSG_CHECKING(for sepol_check_context function)
-	AC_CHECK_LIB(sepol, sepol_check_context, HAVE_SEPOL=yes, HAVE_SEPOL=no)
-	AC_MSG_RESULT($HAVE_SEPOL)
-
-	if test x$HAVE_SEPOL = xyes; then
-		LIBS="-lsepol $LIBS"
-	fi
-
-	AC_MSG_CHECKING(for is_selinux_enabled function)
-	AC_CHECK_LIB(selinux, is_selinux_enabled, HAVE_SELINUX=yes, HAVE_SELINUX=no)
-	AC_MSG_RESULT($HAVE_SELINUX)
-
-	if test x$HAVE_SELINUX = xyes; then
-		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-		LIBS="-lselinux $LIBS"
-	else
-		AC_MSG_WARN(Disabling selinux)
-	fi
-fi
-
-################################################################################
-dnl -- Check for getopt
-AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 to if getopt_long is available.]))
-
-################################################################################
-dnl -- Check for readline (Shamelessly copied from parted 1.4.17)
+dnl Check for readline (Shamelessly copied from parted 1.4.17)
 if test x$READLINE = xyes; then
 	AC_CHECK_LIB(readline, readline, ,
 		AC_MSG_ERROR(
@@ -469,171 +116,29 @@ support with --disable-readline or download and install readline from:
 Note: if you are using precompiled packages you will also need the development
 package as well (which may be called readline-devel or something similar).
 )
+		exit
 	)
-	AC_CHECK_FUNC(rl_completion_matches, AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], 1, [Define to 1 if rl_completion_matches() is available.]))
 fi
 
-################################################################################
-dnl -- Internationalisation stuff
-AC_MSG_CHECKING(whether to enable internationalisation)
-AC_ARG_ENABLE(nls, [  --enable-nls            Enable Native Language Support],
-		INTL=$enableval, INTL=no)
-AC_MSG_RESULT($INTL)
-
-if test x$INTL = xyes; then
-	INTL_PACKAGE="lvm2"
-	AC_PATH_PROG(MSGFMT, msgfmt)
-	if [[ "x$MSGFMT" == x ]];
-		then  AC_MSG_ERROR(
-		msgfmt not found in path $PATH
-		)
-	fi;
-
-	AC_ARG_WITH(localedir,
-  		    [  --with-localedir=DIR    Translation files in DIR [PREFIX/share/locale]],
-  		    [ LOCALEDIR="$withval" ],
-  		    [ LOCALEDIR='${prefix}/share/locale' ])
-fi
-
-################################################################################
-AC_ARG_WITH(confdir,
-	    [  --with-confdir=DIR      Configuration files in DIR [/etc]],
-  	    [ CONFDIR="$withval" ],
- 	    [ CONFDIR='/etc' ])
-
-AC_ARG_WITH(staticdir,
-	    [  --with-staticdir=DIR    Static binary in DIR [EXEC_PREFIX/sbin]],
-  	    [ STATICDIR="$withval" ],
- 	    [ STATICDIR='${exec_prefix}/sbin' ])
-
-################################################################################
-dnl -- Ensure additional headers required
-if test x$READLINE = xyes; then
-	AC_CHECK_HEADERS(readline/readline.h readline/history.h,,AC_MSG_ERROR(bailing out))
-fi
-
-if test x$CLVMD != xnone; then
-	AC_CHECK_HEADERS(mntent.h netdb.h netinet/in.h pthread.h search.h sys/mount.h sys/socket.h sys/uio.h sys/un.h utmpx.h,,AC_MSG_ERROR(bailing out))
-	AC_CHECK_FUNCS(dup2 getmntent memmove select socket,,AC_MSG_ERROR(bailing out))
-	AC_FUNC_GETMNTENT
-#	AC_FUNC_REALLOC
-	AC_FUNC_SELECT_ARGTYPES
-fi
-
-if test x$FSADM = xyes; then
-	AC_CHECK_HEADERS(fstab.h sys/mount.h sys/vfs.h,,AC_MSG_ERROR(bailing out))
-	AC_CHECK_FUNCS(memmove,,AC_MSG_ERROR(bailing out))
-fi
-
-if test x$CLUSTER != xnone; then
-	AC_CHECK_HEADERS(sys/socket.h sys/un.h,,AC_MSG_ERROR(bailing out))
-	AC_CHECK_FUNCS(socket,,AC_MSG_ERROR(bailing out))
-fi
-
-if test x$HAVE_LIBDL = xyes; then
-	AC_CHECK_HEADERS(dlfcn.h,,AC_MSG_ERROR(bailing out))
-fi
-
-if test x$INTL = xyes; then
-	AC_CHECK_HEADERS(libintl.h,,AC_MSG_ERROR(bailing out))
-fi
-
-AC_CHECK_HEADERS(libdevmapper.h,,AC_MSG_ERROR(bailing out))
-
-if test x$HAVE_SELINUX = xyes; then
-	AC_CHECK_HEADERS(selinux/selinux.h,,AC_MSG_ERROR(bailing out))
-fi
-
-################################################################################
-AC_PATH_PROG(MODPROBE_CMD, modprobe)
-
-if test x$MODPROBE_CMD != x; then
-	AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.])
-fi
-
-################################################################################
-if test "-f VERSION"; then
-  LVM_VERSION="\"`cat VERSION`\""
-else
-  LVM_VERSION="Unknown"
-fi
-
-################################################################################
 AC_SUBST(JOBS)
 AC_SUBST(STATIC_LINK)
-AC_SUBST(LVM1)
-AC_SUBST(POOL)
-AC_SUBST(SNAPSHOTS)
-AC_SUBST(MIRRORS)
+AC_SUBST(READLINE)
+AC_SUBST(kernel_dir)
 AC_SUBST(OWNER)
 AC_SUBST(GROUP)
-AC_SUBST(CFLAGS)
-AC_SUBST(COPTIMISE_FLAG)
-AC_SUBST(CLDFLAGS)
-AC_SUBST(CLDWHOLEARCHIVE)
-AC_SUBST(CLDNOWHOLEARCHIVE)
-AC_SUBST(LDDEPS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(LIB_SUFFIX)
 AC_SUBST(LIBS)
-AC_SUBST(LVM_VERSION)
-AC_SUBST(LVM1_FALLBACK)
-AC_SUBST(DEBUG)
-AC_SUBST(DEVMAPPER)
-AC_SUBST(HAVE_LIBDL)
-AC_SUBST(HAVE_SELINUX)
-AC_SUBST(CMDLIB)
-AC_SUBST(MSGFMT)
-AC_SUBST(LOCALEDIR)
-AC_SUBST(CONFDIR)
-AC_SUBST(STATICDIR)
-AC_SUBST(INTL_PACKAGE)
-AC_SUBST(INTL)
-AC_SUBST(CLVMD)
-AC_SUBST(CLUSTER)
-AC_SUBST(FSADM)
-AC_SUBST(DMEVENTD)
-AC_SUBST(CFLOW_CMD)
-AC_SUBST(CSCOPE_CMD)
-
-################################################################################
-dnl -- First and last lines should not contain files to generate in order to 
-dnl -- keep utility scripts running properly
+dnl First and last lines should not contain files to generate in order to 
+dnl keep utility scripts running properly
 AC_OUTPUT( 								\
 Makefile								\
-make.tmpl								\
-daemons/Makefile							\
-daemons/clvmd/Makefile							\
-dmeventd/Makefile							\
-dmeventd/mirror/Makefile						\
-doc/Makefile								\
+make.tmpl                                                               \
 include/Makefile						 	\
 lib/Makefile							 	\
-lib/format1/Makefile						 	\
-lib/format_pool/Makefile						\
-lib/locking/Makefile							\
-lib/mirror/Makefile							\
-lib/snapshot/Makefile							\
 man/Makefile							 	\
-po/Makefile								\
 tools/Makefile							 	\
-tools/version.h								\
-tools/fsadm/Makefile							\
 test/mm/Makefile							\
 test/device/Makefile							\
 test/format1/Makefile							\
 test/regex/Makefile                                                     \
 test/filters/Makefile                                                   \
 )
-
-if test x$ODIRECT != xyes; then
-  AC_MSG_WARN(Warning: O_DIRECT disabled: low-memory pvmove may lock up)
-fi
-
-if test x$FSADM == xyes; then
-  AC_MSG_WARN(fsadm support is untested)
-fi
-
-if test x$DMEVENTD == xyes; then
-  AC_MSG_WARN(dmeventd support is untested)
-fi

daemons/Makefile.in

@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2004 Red Hat, Inc. All rights reserved.
-#
-# This file is part of the LVM2.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU General Public License v.2.
-#
-# 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
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-ifneq ("@CLVMD@", "none")
-  SUBDIRS = clvmd
-endif
-
-include $(top_srcdir)/make.tmpl
-

daemons/clvmd/Makefile.in

@@ -1,84 +0,0 @@
-#
-# Copyright (C) 2004 Red Hat, Inc. All rights reserved.
-#
-# This file is part of the LVM2.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU General Public License v.2.
-#
-# 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
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-SOURCES = \
-	clvmd-command.c  \
-	clvmd.c          \
-	lvm-functions.c  \
-	system-lv.c
-
-ifeq ("@CLVMD@", "gulm")
-	GULM = yes
-endif
-
-ifeq ("@CLVMD@", "cman")
-	CMAN = yes
-endif
-
-ifeq ("@CLVMD@", "all")
-	GULM = yes
-	CMAN = yes
-endif
-
-ifeq ("@DEBUG@", "yes")
-	DEFS += -DDEBUG
-endif
-
-ifeq ("$(GULM)", "yes")
-	SOURCES += clvmd-gulm.c tcp-comms.c
-	LMLIBS += -lccs -lgulm
-	DEFS += -DUSE_GULM
-endif
-
-ifeq ("$(CMAN)", "yes")
-	SOURCES += clvmd-cman.c
-	LMLIBS += -ldlm -lcman
-	DEFS += -DUSE_CMAN
-endif
-
-TARGETS = \
-	clvmd
-
-LVMLIBS = -llvm -lpthread
-
-ifeq ("@DMEVENTD@", "yes")
-	LVMLIBS += -ldevmapper-event
-endif
- 
-LVMLIBS += -ldevmapper
-
-DEFS += -D_REENTRANT
-CFLAGS += -fno-strict-aliasing
-
-include $(top_srcdir)/make.tmpl
-
-INSTALL_TARGETS = \
-	install_clvmd
-
-clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a
-	$(CC) -o clvmd $(OBJECTS) $(LDFLAGS) $(LVMLIBS) $(LMLIBS) $(LIBS)
-
-.PHONY: install_clvmd
-
-install_clvmd: $(TARGETS)
-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) clvmd \
-		$(sbindir)/clvmd
-
-install: $(INSTALL_TARGETS)
-
-install_cluster: $(INSTALL_TARGETS)
-

daemons/clvmd/clvm.h

@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * 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
- */
-
-/* Definitions for CLVMD server and clients */
-
-/*
- * The protocol spoken over the cluster and across the local socket.
- */
-
-#ifndef _CLVM_H
-#define _CLVM_H
-
-struct clvm_header {
-	uint8_t  cmd;	        /* See below */
-	uint8_t  flags;	        /* See below */
-	uint16_t xid;	        /* Transaction ID */
-	uint32_t clientid;	/* Only used in Daemon->Daemon comms */
-	int32_t  status;	/* For replies, whether request succeeded */
-	uint32_t arglen;	/* Length of argument below. 
-				   If >1500 then it will be passed 
-				   around the cluster in the system LV */
-	char node[1];		/* Actually a NUL-terminated string, node name.
-				   If this is empty then the command is 
-				   forwarded to all cluster nodes unless 
-				   FLAG_LOCAL is also set. */
-	char args[1];		/* Arguments for the command follow the 
-				   node name, This member is only
-				   valid if the node name is empty */
-} __attribute__ ((packed));
-
-/* Flags */
-#define CLVMD_FLAG_LOCAL        1	/* Only do this on the local node */
-#define CLVMD_FLAG_SYSTEMLV     2	/* Data in system LV under my node name */
-#define CLVMD_FLAG_NODEERRS     4       /* Reply has errors in node-specific portion */
-
-/* Name of the local socket to communicate between libclvm and clvmd */
-//static const char CLVMD_SOCKNAME[]="/var/run/clvmd";
-static const char CLVMD_SOCKNAME[] = "\0clvmd";
-
-/* Internal commands & replies */
-#define CLVMD_CMD_REPLY    1
-#define CLVMD_CMD_VERSION  2	/* Send version around cluster when we start */
-#define CLVMD_CMD_GOAWAY   3	/* Die if received this - we are running 
-				   an incompatible version */
-#define CLVMD_CMD_TEST     4	/* Just for mucking about */
-
-#define CLVMD_CMD_LOCK              30
-#define CLVMD_CMD_UNLOCK            31
-
-/* Lock/Unlock commands */
-#define CLVMD_CMD_LOCK_LV           50
-#define CLVMD_CMD_LOCK_VG           51
-
-#endif

daemons/clvmd/clvmd-cman.c

@@ -1,494 +0,0 @@
-/*
- * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * 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
- */
-
-/*
- * CMAN communication layer for clvmd.
- */
-
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <syslog.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <signal.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <errno.h>
-
-#include "clvmd-comms.h"
-#include "clvm.h"
-#include "libdlm.h"
-#include "log.h"
-#include "clvmd.h"
-#include "lvm-functions.h"
-
-#define LOCKSPACE_NAME "clvmd"
-
-static int num_nodes;
-static struct cman_node *nodes = NULL;
-static struct cman_node this_node;
-static int count_nodes; /* size of allocated nodes array */
-static int max_updown_nodes = 50;	/* Current size of the allocated array */
-/* Node up/down status, indexed by nodeid */
-static int *node_updown = NULL;
-static dlm_lshandle_t *lockspace;
-static cman_handle_t c_handle;
-
-static void count_clvmds_running(void);
-static void get_members(void);
-static int nodeid_from_csid(char *csid);
-static int name_from_nodeid(int nodeid, char *name);
-static void event_callback(cman_handle_t handle, void *private, int reason, int arg);
-static void data_callback(cman_handle_t handle, void *private,
-			  char *buf, int len, uint8_t port, int nodeid);
-
-struct lock_wait {
-	pthread_cond_t cond;
-	pthread_mutex_t mutex;
-	struct dlm_lksb lksb;
-};
-
-static int _init_cluster(void)
-{
-	/* Open the cluster communication socket */
-	c_handle = cman_init(NULL);
-	if (!c_handle) {
-		syslog(LOG_ERR, "Can't open cluster manager socket: %m");
-		return -1;
-	}
-
-	if (cman_start_recv_data(c_handle, data_callback, CLUSTER_PORT_CLVMD)) {
-		syslog(LOG_ERR, "Can't bind cluster socket: %m");
-		return -1;
-	}
-
-	if (cman_start_notification(c_handle, event_callback)) {
-		syslog(LOG_ERR, "Can't start cluster event listening");
-		return -1;
-	}
-
-	/* Get the cluster members list */
-	get_members();
-	count_clvmds_running();
-
-	/* Create a lockspace for LV & VG locks to live in */
-	lockspace = dlm_create_lockspace(LOCKSPACE_NAME, 0600);
-	if (!lockspace) {
-		syslog(LOG_ERR, "Unable to create lockspace for CLVM: %m");
-		return -1;
-	}
-	dlm_ls_pthread_init(lockspace);
-
-	return 0;
-}
-
-static void _cluster_init_completed(void)
-{
-	clvmd_cluster_init_completed();
-}
-
-static int _get_main_cluster_fd()
-{
-	return cman_get_fd(c_handle);
-}
-
-static int _get_num_nodes()
-{
-	int i;
-	int nnodes = 0;
-
-	/* return number of ACTIVE nodes */
-	for (i=0; i<num_nodes; i++) {
-		if (nodes[i].cn_member)
-			nnodes++;
-	}
-	return nnodes;
-}
-
-/* send_message with the fd check removed */
-static int _cluster_send_message(void *buf, int msglen, char *csid, const char *errtext)
-{
-	int nodeid = 0;
-
-	if (csid)
-		memcpy(&nodeid, csid, CMAN_MAX_CSID_LEN);
-
-	if (cman_send_data(c_handle, buf, msglen, 0, CLUSTER_PORT_CLVMD, nodeid) <= 0)
-	{
-			log_error(errtext);
-	}
-	return msglen;
-}
-
-static void _get_our_csid(char *csid)
-{
-	if (this_node.cn_nodeid == 0) {
-		cman_get_node(c_handle, 0, &this_node);
-	}
-	memcpy(csid, &this_node.cn_nodeid, CMAN_MAX_CSID_LEN);
-}
-
-/* Call a callback routine for each node is that known (down means not running a clvmd) */
-static int _cluster_do_node_callback(struct local_client *client,
-			     void (*callback) (struct local_client *, char *,
-					       int))
-{
-	int i;
-	int somedown = 0;
-
-	for (i = 0; i < _get_num_nodes(); i++) {
-		callback(client, (char *)&nodes[i].cn_nodeid, node_updown[nodes[i].cn_nodeid]);
-		if (!node_updown[nodes[i].cn_nodeid])
-			somedown = -1;
-	}
-	return somedown;
-}
-
-/* Process OOB message from the cluster socket,
-   this currently just means that a node has stopped listening on our port */
-static void event_callback(cman_handle_t handle, void *private, int reason, int arg)
-{
-	char namebuf[MAX_CLUSTER_NAME_LEN];
-
-	switch (reason) {
-        case CMAN_REASON_PORTCLOSED:
-		name_from_nodeid(arg, namebuf);
-		log_notice("clvmd on node %s has died\n", namebuf);
-		DEBUGLOG("Got port closed message, removing node %s\n", namebuf);
-
-		node_updown[arg] = 0;
-		break;
-
-	case CMAN_REASON_STATECHANGE:
-		DEBUGLOG("Got state change message, re-reading members list\n");
-		get_members();
-		break;
-
-#if defined(LIBCMAN_VERSION) && LIBCMAN_VERSION >= 2
-	case CMAN_REASON_PORTOPENED:
-		/* Ignore this, wait for startup message from clvmd itself */
-		break;
-
-	case CMAN_REASON_TRY_SHUTDOWN:
-		DEBUGLOG("Got try shutdown, sending OK\n");
-		cman_replyto_shutdown(c_handle, 1);
-		break;
-#endif
-	default:
-		/* ERROR */
-		DEBUGLOG("Got unknown event callback message: %d\n", reason);
-		break;
-	}
-}
-
-static struct local_client *cman_client;
-static int _cluster_fd_callback(struct local_client *fd, char *buf, int len, char *csid,
-			struct local_client **new_client)
-{
-
-	/* Save this for data_callback */
-	cman_client = fd;
-
-	/* We never return a new client */
-	*new_client = NULL;
-
-	return cman_dispatch(c_handle, 0);
-}
-
-
-static void data_callback(cman_handle_t handle, void *private,
-			  char *buf, int len, uint8_t port, int nodeid)
-{
-	/* Ignore looped back messages */
-	if (nodeid == this_node.cn_nodeid)
-		return;
-	process_message(cman_client, buf, len, (char *)&nodeid);
-}
-
-static void _add_up_node(char *csid)
-{
-	/* It's up ! */
-	int nodeid = nodeid_from_csid(csid);
-
-	if (nodeid >= max_updown_nodes) {
-	        int new_size = nodeid + 10;
-		int *new_updown = realloc(node_updown, new_size);
-
-		if (new_updown) {
-			node_updown = new_updown;
-			max_updown_nodes = new_size;
-			DEBUGLOG("realloced more space for nodes. now %d\n",
-				 max_updown_nodes);
-		} else {
-			log_error
-			    ("Realloc failed. Node status for clvmd will be wrong. quitting\n");
-			exit(999);
-		}
-	}
-	node_updown[nodeid] = 1;
-	DEBUGLOG("Added new node %d to updown list\n", nodeid);
-}
-
-static void _cluster_closedown()
-{
-	unlock_all();
-	dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
-	cman_finish(c_handle);
-}
-
-static int is_listening(int nodeid)
-{
-	int status;
-
-	do {
-		status = cman_is_listening(c_handle, nodeid, CLUSTER_PORT_CLVMD);
-		if (status < 0 && errno == EBUSY) {	/* Don't busywait */
-			sleep(1);
-			errno = EBUSY;	/* In case sleep trashes it */
-		}
-	}
-	while (status < 0 && errno == EBUSY);
-
-	return status;
-}
-
-/* Populate the list of CLVMDs running.
-   called only at startup time */
-static void count_clvmds_running(void)
-{
-	int i;
-
-	for (i = 0; i < num_nodes; i++) {
-		node_updown[nodes[i].cn_nodeid] = is_listening(nodes[i].cn_nodeid);
-	}
-}
-
-/* Get a list of active cluster members */
-static void get_members()
-{
-	int retnodes;
-	int status;
-
-	num_nodes = cman_get_node_count(c_handle);
-	if (num_nodes == -1) {
-		log_error("Unable to get node count");
-		return;
-	}
-
-	        /* Not enough room for new nodes list ? */
-	        if (num_nodes > count_nodes && nodes) {
-			free(nodes);
-			nodes = NULL;
-		}
-
-		if (nodes == NULL) {
-		        count_nodes = num_nodes + 10; /* Overallocate a little */
-		nodes = malloc(count_nodes * sizeof(struct cman_node));
-			if (!nodes) {
-			        log_error("Unable to allocate nodes array\n");
-				exit(5);
-			}
-		}
-
-	status = cman_get_nodes(c_handle, count_nodes, &retnodes, nodes);
-	if (status < 0) {
-		        log_error("Unable to get node details");
-			exit(6);
-		}
-
-		if (node_updown == NULL) {
-			node_updown =
-			    (int *) malloc(sizeof(int) *
-					   max(num_nodes, max_updown_nodes));
-			memset(node_updown, 0,
-			       sizeof(int) * max(num_nodes, max_updown_nodes));
-		}
-	}
-
-/* Convert a node name to a CSID */
-static int _csid_from_name(char *csid, char *name)
-{
-	int i;
-
-	for (i = 0; i < num_nodes; i++) {
-		if (strcmp(name, nodes[i].cn_name) == 0) {
-			memcpy(csid, &nodes[i].cn_nodeid, CMAN_MAX_CSID_LEN);
-			return 0;
-		}
-	}
-	return -1;
-}
-
-/* Convert a CSID to a node name */
-static int _name_from_csid(char *csid, char *name)
-{
-	int i;
-
-	for (i = 0; i < num_nodes; i++) {
-		if (memcmp(csid, &nodes[i].cn_nodeid, CMAN_MAX_CSID_LEN) == 0) {
-			strcpy(name, nodes[i].cn_name);
-			return 0;
-		}
-	}
-	/* Who?? */
-	strcpy(name, "Unknown");
-	return -1;
-}
-
-/* Convert a node ID to a node name */
-static int name_from_nodeid(int nodeid, char *name)
-{
-	int i;
-
-	for (i = 0; i < num_nodes; i++) {
-		if (nodeid == nodes[i].cn_nodeid) {
-			strcpy(name, nodes[i].cn_name);
-			return 0;
-		}
-	}
-	/* Who?? */
-	strcpy(name, "Unknown");
-	return -1;
-}
-
-/* Convert a CSID to a node ID */
-static int nodeid_from_csid(char *csid)
-{
-        int nodeid;
-
-	memcpy(&nodeid, csid, CMAN_MAX_CSID_LEN);
-
-	return nodeid;
-}
-
-static int _is_quorate()
-{
-	return cman_is_quorate(c_handle);
-}
-
-static void sync_ast_routine(void *arg)
-{
-	struct lock_wait *lwait = arg;
-
-	pthread_mutex_lock(&lwait->mutex);
-	pthread_cond_signal(&lwait->cond);
-	pthread_mutex_unlock(&lwait->mutex);
-}
-
-static int _sync_lock(const char *resource, int mode, int flags, int *lockid)
-{
-	int status;
-	struct lock_wait lwait;
-
-	if (!lockid) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	DEBUGLOG("sync_lock: '%s' mode:%d flags=%d\n", resource,mode,flags);
-	/* Conversions need the lockid in the LKSB */
-	if (flags & LKF_CONVERT)
-		lwait.lksb.sb_lkid = *lockid;
-
-	pthread_cond_init(&lwait.cond, NULL);
-	pthread_mutex_init(&lwait.mutex, NULL);
-	pthread_mutex_lock(&lwait.mutex);
-
-	status = dlm_ls_lock(lockspace,
-			     mode,
-			     &lwait.lksb,
-			     flags,
-			     resource,
-			     strlen(resource),
-			     0, sync_ast_routine, &lwait, NULL, NULL);
-	if (status)
-		return status;
-
-	/* Wait for it to complete */
-	pthread_cond_wait(&lwait.cond, &lwait.mutex);
-	pthread_mutex_unlock(&lwait.mutex);
-
-	*lockid = lwait.lksb.sb_lkid;
-
-	errno = lwait.lksb.sb_status;
-	DEBUGLOG("sync_lock: returning lkid %x\n", *lockid);
-	if (lwait.lksb.sb_status)
-		return -1;
-	else
-		return 0;
-}
-
-static int _sync_unlock(const char *resource /* UNUSED */, int lockid)
-{
-	int status;
-	struct lock_wait lwait;
-
-	DEBUGLOG("sync_unlock: '%s' lkid:%x\n", resource, lockid);
-
-	pthread_cond_init(&lwait.cond, NULL);
-	pthread_mutex_init(&lwait.mutex, NULL);
-	pthread_mutex_lock(&lwait.mutex);
-
-	status = dlm_ls_unlock(lockspace, lockid, 0, &lwait.lksb, &lwait);
-
-	if (status)
-		return status;
-
-	/* Wait for it to complete */
-	pthread_cond_wait(&lwait.cond, &lwait.mutex);
-	pthread_mutex_unlock(&lwait.mutex);
-
-	errno = lwait.lksb.sb_status;
-	if (lwait.lksb.sb_status != EUNLOCK)
-		return -1;
-	else
-		return 0;
-
-}
-
-static struct cluster_ops _cluster_cman_ops = {
-	.cluster_init_completed   = _cluster_init_completed,
-	.cluster_send_message     = _cluster_send_message,
-	.name_from_csid           = _name_from_csid,
-	.csid_from_name           = _csid_from_name,
-	.get_num_nodes            = _get_num_nodes,
-	.cluster_fd_callback      = _cluster_fd_callback,
-	.get_main_cluster_fd      = _get_main_cluster_fd,
-	.cluster_do_node_callback = _cluster_do_node_callback,
-	.is_quorate               = _is_quorate,
-	.get_our_csid             = _get_our_csid,
-	.add_up_node              = _add_up_node,
-	.cluster_closedown        = _cluster_closedown,
-	.sync_lock                = _sync_lock,
-	.sync_unlock              = _sync_unlock,
-};
-
-struct cluster_ops *init_cman_cluster(void)
-{
-	if (!_init_cluster())
-		return &_cluster_cman_ops;
-	else
-		return NULL;
-}

daemons/clvmd/clvmd-command.c

@@ -1,286 +0,0 @@
-/*
- * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * 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
- */
-
-/*
-
-  CLVMD Cluster LVM daemon command processor.
-
-  To add commands to the daemon simply add a processor in do_command and return
-  and messages back in buf and the length in *retlen. The initial value of
-  buflen is the maximum size of the buffer. if buf is not large enough then it
-  may be reallocated by the functions in here to a suitable size bearing in
-  mind that anything larger than the passed-in size will have to be returned
-  using the system LV and so performance will suffer.
-
-  The status return will be negated and passed back to the originating node.
-
-  pre- and post- command routines are called only on the local node. The
-  purpose is primarily to get and release locks, though the pre- routine should
-  also do any other local setups required by the command (if any) and can
-  return a failure code that prevents the command from being distributed around
-  the cluster
-
-  The pre- and post- routines are run in their own thread so can block as long
-  they like, do_command is run in the main clvmd thread so should not block for
-  too long. If the pre-command returns an error code (!=0) then the command
-  will not be propogated around the cluster but the post-command WILL be called
-
-  Also note that the pre and post routine are *always* called on the local
-  node, even if the command to be executed was only requested to run on a
-  remote node. It may peek inside the client structure to check the status of
-  the command.
-
-  The clients of the daemon must, naturally, understand the return messages and
-  codes.
-
-  Routines in here may only READ the values in the client structure passed in
-  apart from client->private which they are free to do what they like with.
-
-*/
-
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "libdevmapper.h"
-#include "list.h"
-#include "locking.h"
-#include "log.h"
-#include "lvm-functions.h"
-#include "clvmd-comms.h"
-#include "clvm.h"
-#include "clvmd.h"
-#include "libdlm.h"
-
-/* This is where all the real work happens:
-   NOTE: client will be NULL when this is executed on a remote node */
-int do_command(struct local_client *client, struct clvm_header *msg, int msglen,
-	       char **buf, int buflen, int *retlen)
-{
-	char *args = msg->node + strlen(msg->node) + 1;
-	int arglen = msglen - sizeof(struct clvm_header) - strlen(msg->node);
-	int status = 0;
-	char *lockname;
-	struct utsname nodeinfo;
-	unsigned char lock_cmd;
-	unsigned char lock_flags;
-
-	/* Do the command */
-	switch (msg->cmd) {
-		/* Just a test message */
-	case CLVMD_CMD_TEST:
-		if (arglen > buflen) {
-			buflen = arglen + 200;
-			*buf = realloc(*buf, buflen);
-		}
-		uname(&nodeinfo);
-		*retlen = 1 + snprintf(*buf, buflen, "TEST from %s: %s v%s",
-				       nodeinfo.nodename, args,
-				       nodeinfo.release);
-		break;
-
-	case CLVMD_CMD_LOCK_VG:
-		/* Check to see if the VG is in use by LVM1 */
-		status = do_check_lvm1(&args[2]);
-		break;
-
-	case CLVMD_CMD_LOCK_LV:
-		/* This is the biggie */
-		lock_cmd = args[0] & 0x3F;
-		lock_flags = args[1];
-		lockname = &args[2];
-		status = do_lock_lv(lock_cmd, lock_flags, lockname);
-		/* Replace EIO with something less scary */
-		if (status == EIO) {
-			*retlen =
-			    1 + snprintf(*buf, buflen,
-					 "Internal lvm error, check syslog");
-			return EIO;
-		}
-		break;
-
-	default:
-		/* Won't get here because command is validated in pre_command */
-		break;
-	}
-
-	/* Check the status of the command and return the error text */
-	if (status) {
-		*retlen = 1 + snprintf(*buf, buflen, strerror(status));
-	}
-
-	return status;
-
-}
-
-static int lock_vg(struct local_client *client)
-{
-    struct dm_hash_table *lock_hash;
-    struct clvm_header *header =
-	(struct clvm_header *) client->bits.localsock.cmd;
-    unsigned char lock_cmd;
-    unsigned char lock_flags;
-    char *args = header->node + strlen(header->node) + 1;
-    int lkid;
-    int status = 0;
-    char *lockname;
-
-    /* Keep a track of VG locks in our own hash table. In current
-       practice there should only ever be more than two VGs locked
-       if a user tries to merge lots of them at once */
-    if (client->bits.localsock.private) {
-	lock_hash = (struct dm_hash_table *)client->bits.localsock.private;
-    }
-    else {
-	lock_hash = dm_hash_create(3);
-	if (!lock_hash)
-	    return ENOMEM;
-	client->bits.localsock.private = (void *)lock_hash;
-    }
-
-    lock_cmd = args[0] & 0x3F;
-    lock_flags = args[1];
-    lockname = &args[2];
-    DEBUGLOG("doing PRE command LOCK_VG '%s' at %x (client=%p)\n", lockname, lock_cmd, client);
-
-    if (lock_cmd == LCK_UNLOCK) {
-
-	lkid = (int)(long)dm_hash_lookup(lock_hash, lockname);
-	if (lkid == 0)
-	    return EINVAL;
-
-	status = sync_unlock(lockname, lkid);
-	if (status)
-	    status = errno;
-	else
-	    dm_hash_remove(lock_hash, lockname);
-    }
-    else {
-
-	status = sync_lock(lockname, (int)lock_cmd, (lock_flags & LCK_NONBLOCK) ? LKF_NOQUEUE : 0, &lkid);
-	if (status)
-	    status = errno;
-	else
-	    dm_hash_insert(lock_hash, lockname, (void *)lkid);
-    }
-
-    return status;
-}
-
-
-/* Pre-command is a good place to get locks that are needed only for the duration
-   of the commands around the cluster (don't forget to free them in post-command),
-   and to sanity check the command arguments */
-int do_pre_command(struct local_client *client)
-{
-	struct clvm_header *header =
-	    (struct clvm_header *) client->bits.localsock.cmd;
-	unsigned char lock_cmd;
-	unsigned char lock_flags;
-	char *args = header->node + strlen(header->node) + 1;
-	int lockid;
-	int status = 0;
-	char *lockname;
-
-	switch (header->cmd) {
-	case CLVMD_CMD_TEST:
-		status = sync_lock("CLVMD_TEST", LKM_EXMODE, 0, &lockid);
-		client->bits.localsock.private = (void *) lockid;
-		break;
-
-	case CLVMD_CMD_LOCK_VG:
-       	        status = lock_vg(client);
-		break;
-
-	case CLVMD_CMD_LOCK_LV:
-		lock_cmd = args[0];
-		lock_flags = args[1];
-		lockname = &args[2];
-		status = pre_lock_lv(lock_cmd, lock_flags, lockname);
-		break;
-
-	default:
-		log_error("Unknown command %d received\n", header->cmd);
-		status = EINVAL;
-	}
-	return status;
-}
-
-/* Note that the post-command routine is called even if the pre-command or the real command
-   failed */
-int do_post_command(struct local_client *client)
-{
-	struct clvm_header *header =
-	    (struct clvm_header *) client->bits.localsock.cmd;
-	int status = 0;
-	unsigned char lock_cmd;
-	unsigned char lock_flags;
-	char *args = header->node + strlen(header->node) + 1;
-	char *lockname;
-
-	switch (header->cmd) {
-	case CLVMD_CMD_TEST:
-		status =
-		    sync_unlock("CLVMD_TEST", (int) (long) client->bits.localsock.private);
-		client->bits.localsock.private = 0;
-		break;
-
-	case CLVMD_CMD_LOCK_VG:
-		/* Nothing to do here */
-		break;
-
-	case CLVMD_CMD_LOCK_LV:
-		lock_cmd = args[0];
-		lock_flags = args[1];
-		lockname = &args[2];
-		status = post_lock_lv(lock_cmd, lock_flags, lockname);
-		break;
-	}
-	return status;
-}
-
-
-/* Called when the client is about to be deleted */
-void cmd_client_cleanup(struct local_client *client)
-{
-    if (client->bits.localsock.private) {
-
-	struct dm_hash_node *v;
-	struct dm_hash_table *lock_hash =
-	    (struct dm_hash_table *)client->bits.localsock.private;
-
-	dm_hash_iterate(v, lock_hash) {
-		int lkid = (int)(long)dm_hash_get_data(lock_hash, v);
-		char *lockname = dm_hash_get_key(lock_hash, v);
-
-		DEBUGLOG("cleanup: Unlocking lock %s %x\n", lockname, lkid);
-		sync_unlock(lockname, lkid);
-	}
-
-	dm_hash_destroy(lock_hash);
-	client->bits.localsock.private = 0;
-    }
-}

daemons/clvmd/clvmd-comms.h

@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * 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
- */
-
-/*
- * Abstraction layer for clvmd cluster communications
- */
-
-#ifndef _CLVMD_COMMS_H
-#define _CLVMD_COMMS_H
-
-struct local_client;
-
-struct cluster_ops {
-	void (*cluster_init_completed) (void);
-
-	int (*cluster_send_message) (void *buf, int msglen, char *csid,
-				const char *errtext);
-	int (*name_from_csid) (char *csid, char *name);
-	int (*csid_from_name) (char *csid, char *name);
-	int (*get_num_nodes) (void);
-	int (*cluster_fd_callback) (struct local_client *fd, char *buf, int len,
-			       char *csid, struct local_client **new_client);
-	int (*get_main_cluster_fd) (void);	/* gets accept FD or cman cluster socket */
-	int (*cluster_do_node_callback) (struct local_client *client,
-				    void (*callback) (struct local_client *,
-						      char *csid, int node_up));
-	int (*is_quorate) (void);
-
-	void (*get_our_csid) (char *csid);
-	void (*add_up_node) (char *csid);
-	void (*reread_config) (void);
-	void (*cluster_closedown) (void);
-
-	int (*sync_lock) (const char *resource, int mode, int flags, int *lockid);
-	int (*sync_unlock) (const char *resource, int lockid);
-
-};
-
-#ifdef USE_GULM
-#  include "tcp-comms.h"
-struct cluster_ops *init_gulm_cluster(void);
-#define MAX_CSID_LEN 			GULM_MAX_CSID_LEN
-#define MAX_CLUSTER_MEMBER_NAME_LEN	GULM_MAX_CLUSTER_MEMBER_NAME_LEN
-#endif
-
-#ifdef USE_CMAN
-#  include <netinet/in.h>
-#  include "libcman.h"
-#  define CMAN_MAX_CSID_LEN 4
-#  ifndef MAX_CSID_LEN
-#    define MAX_CSID_LEN CMAN_MAX_CSID_LEN
-#  endif
-#  undef MAX_CLUSTER_MEMBER_NAME_LEN
-#  define MAX_CLUSTER_MEMBER_NAME_LEN   CMAN_MAX_NODENAME_LEN
-#  define CMAN_MAX_CLUSTER_MESSAGE 1500
-#  define CLUSTER_PORT_CLVMD 11
-struct cluster_ops *init_cman_cluster(void);
-#endif
-
-
-
-#endif

daemons/clvmd/clvmd-gulm.h

@@ -1,12 +0,0 @@
-
-
-
-extern int get_next_node_csid(void **context, char *csid);
-extern void add_down_node(char *csid);
-extern int gulm_fd(void);
-extern int get_ip_address(char *node, char *addr);
-extern void tcp_remove_client(char *csid);
-extern int alloc_client(int fd, char *csid, struct local_client **new_client);
-
-void gulm_add_up_node(char *csid);
-int gulm_name_from_csid(char *csid, char *name);

daemons/clvmd/clvmd.h

@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * 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
- */
-
-#ifndef _CLVMD_H
-#define _CLVMD_H
-
-#define CLVMD_MAJOR_VERSION 0
-#define CLVMD_MINOR_VERSION 2
-#define CLVMD_PATCH_VERSION 1
-
-/* Name of the cluster LVM admin lock */
-#define ADMIN_LOCK_NAME "CLVMD_ADMIN"
-
-/* Default time (in seconds) we will wait for all remote commands to execute
-   before declaring them dead */
-#define DEFAULT_CMD_TIMEOUT 60
-
-/* One of these for each reply we get from command execution on a node */
-struct node_reply {
-	char node[MAX_CLUSTER_MEMBER_NAME_LEN];
-	char *replymsg;
-	int status;
-	struct node_reply *next;
-};
-
-/*
- * These exist for the use of local sockets only when we are
- * collecting responses from all cluster nodes
- */
-struct localsock_bits {
-	struct node_reply *replies;
-	int num_replies;
-	int expected_replies;
-	time_t sent_time;	/* So we can check for timeouts */
-	int in_progress;	/* Only execute one cmd at a time per client */
-	int sent_out;		/* Flag to indicate that a command was sent
-				   to remote nodes */
-	void *private;		/* Private area for command processor use */
-	void *cmd;		/* Whole command as passed down local socket */
-	int cmd_len;		/* Length of above */
-	int pipe;		/* Pipe to send PRE completion status down */
-	int finished;		/* Flag to tell subthread to exit */
-	int all_success;	/* Set to 0 if any node (or the pre_command)
-				   failed */
-	struct local_client *pipe_client;
-	pthread_t threadid;
-	enum { PRE_COMMAND, POST_COMMAND, QUIT } state;
-	pthread_mutex_t mutex;	/* Main thread and worker synchronisation */
-	pthread_cond_t cond;
-
-	pthread_mutex_t reply_mutex;	/* Protect reply structure */
-};
-
-/* Entries for PIPE clients */
-struct pipe_bits {
-	struct local_client *client;	/* Actual (localsock) client */
-	pthread_t threadid;		/* Our own copy of the thread id */
-};
-
-/* Entries for Network socket clients */
-struct netsock_bits {
-	void *private;
-	int flags;
-};
-
-typedef int (*fd_callback_t) (struct local_client * fd, char *buf, int len,
-			      char *csid, struct local_client ** new_client);
-
-/* One of these for each fd we are listening on */
-struct local_client {
-	int fd;
-	enum { CLUSTER_MAIN_SOCK, CLUSTER_DATA_SOCK, LOCAL_RENDEZVOUS,
-		    LOCAL_SOCK, THREAD_PIPE, CLUSTER_INTERNAL } type;
-	struct local_client *next;
-	unsigned short xid;
-	fd_callback_t callback;
-	uint8_t removeme;
-
-	union {
-		struct localsock_bits localsock;
-		struct pipe_bits pipe;
-		struct netsock_bits net;
-	} bits;
-};
-
-#ifdef DEBUG
-#define DEBUGLOG(fmt, args...) {time_t P; time(&P); fprintf(stderr, "CLVMD[%x]: %.15s ", (int)pthread_self(), ctime(&P)+4 ); fprintf(stderr, fmt, ## args);}
-#else
-#define DEBUGLOG(fmt, args...)
-#endif
-
-#ifndef max
-#define max(a,b) ((a)>(b)?(a):(b))
-#endif
-
-/* The real command processor is in clvmd-command.c */
-extern int do_command(struct local_client *client, struct clvm_header *msg,
-		      int msglen, char **buf, int buflen, int *retlen);
-
-/* Pre and post command routines are called only on the local node */
-extern int do_pre_command(struct local_client *client);
-extern int do_post_command(struct local_client *client);
-extern void cmd_client_cleanup(struct local_client *client);
-extern int add_client(struct local_client *new_client);
-
-extern void clvmd_cluster_init_completed(void);
-extern void process_message(struct local_client *client, char *buf, int len, char *csid);
-
-int sync_lock(const char *resource, int mode, int flags, int *lockid);
-int sync_unlock(const char *resource, int lockid);
-
-#endif

daemons/clvmd/cnxman-socket.h

@@ -1,226 +0,0 @@
-/******************************************************************************
-*******************************************************************************
-**
-**  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-**  Copyright (C) 2004 Red Hat, Inc.  All rights reserved.
-**
-**  This copyrighted material is made available to anyone wishing to use,
-**  modify, copy, or redistribute it subject to the terms and conditions
-**  of the GNU General Public License v.2.
-**
-*******************************************************************************
-******************************************************************************/
-
-/* CMAN socket interface header,
-   may be include by user or kernel code */
-
-#ifndef __CNXMAN_SOCKET_H
-#define __CNXMAN_SOCKET_H
-
-/* A currently unused number. TIPC also uses this number and you're unlikely
-   to be using both.
- */
-#define AF_CLUSTER 30
-#define PF_CLUSTER AF_CLUSTER
-
-/* Protocol(socket) types */
-#define CLPROTO_MASTER 2
-#define CLPROTO_CLIENT 3
-
-/* ioctls -- should register these properly */
-#define SIOCCLUSTER_NOTIFY            _IOW('x', 0x01, int)
-#define SIOCCLUSTER_REMOVENOTIFY      _IO( 'x', 0x02)
-#define SIOCCLUSTER_GETMEMBERS        _IOR('x', 0x03, struct cl_cluster_nodelist)
-#define SIOCCLUSTER_SETEXPECTED_VOTES _IOW('x', 0x04, int)
-#define SIOCCLUSTER_ISQUORATE         _IO( 'x', 0x05)
-#define SIOCCLUSTER_ISLISTENING       _IOW('x', 0x06, struct cl_listen_request)
-#define SIOCCLUSTER_GETALLMEMBERS     _IOR('x', 0x07, struct cl_cluster_nodelist)
-#define SIOCCLUSTER_SET_VOTES         _IOW('x', 0x08, int)
-#define SIOCCLUSTER_GET_VERSION       _IOR('x', 0x09, struct cl_version)
-#define SIOCCLUSTER_SET_VERSION       _IOW('x', 0x0a, struct cl_version)
-#define SIOCCLUSTER_ISACTIVE          _IO( 'x', 0x0b)
-#define SIOCCLUSTER_KILLNODE          _IOW('x', 0x0c, int)
-#define SIOCCLUSTER_GET_JOINCOUNT     _IO( 'x', 0x0d)
-#define SIOCCLUSTER_SERVICE_REGISTER  _IOW('x', 0x0e, char)
-#define SIOCCLUSTER_SERVICE_UNREGISTER _IO('x', 0x0f)
-#define SIOCCLUSTER_SERVICE_JOIN      _IO( 'x', 0x10)
-#define SIOCCLUSTER_SERVICE_LEAVE     _IO( 'x', 0x20)
-#define SIOCCLUSTER_SERVICE_SETSIGNAL _IOW('x', 0x30, int)
-#define SIOCCLUSTER_SERVICE_STARTDONE _IOW('x', 0x40, unsigned int)
-#define SIOCCLUSTER_SERVICE_GETEVENT  _IOR('x', 0x50, struct cl_service_event)
-#define SIOCCLUSTER_SERVICE_GETMEMBERS _IOR('x', 0x60, struct cl_cluster_nodelist)
-#define SIOCCLUSTER_SERVICE_GLOBALID  _IOR('x', 0x70, uint32_t)
-#define SIOCCLUSTER_SERVICE_SETLEVEL  _IOR('x', 0x80, int)
-#define SIOCCLUSTER_GETNODE	      _IOWR('x', 0x90, struct cl_cluster_node)
-#define SIOCCLUSTER_BARRIER           _IOW('x', 0x0a0, struct cl_barrier_info)
-
-/* These were setsockopts */
-#define SIOCCLUSTER_PASS_SOCKET       _IOW('x', 0x0b0, struct cl_passed_sock)
-#define SIOCCLUSTER_SET_NODENAME      _IOW('x', 0x0b1, char *)
-#define SIOCCLUSTER_SET_NODEID        _IOW('x', 0x0b2, int)
-#define SIOCCLUSTER_JOIN_CLUSTER      _IOW('x', 0x0b3, struct cl_join_cluster_info)
-#define SIOCCLUSTER_LEAVE_CLUSTER     _IOW('x', 0x0b4, int)
-
-
-/* Maximum size of a cluster message */
-#define CMAN_MAX_CLUSTER_MESSAGE          1500
-#define CMAN_MAX_CLUSTER_MEMBER_NAME_LEN   255
-#define MAX_BARRIER_NAME_LEN           33
-#define MAX_SA_ADDR_LEN                12
-#define MAX_CLUSTER_NAME_LEN           16
-
-/* Well-known cluster port numbers */
-#define CLUSTER_PORT_MEMBERSHIP  1	/* Mustn't block during cluster
-					 * transitions! */
-#define CLUSTER_PORT_SERVICES    2
-#define CLUSTER_PORT_SYSMAN      10	/* Remote execution daemon */
-#define CLUSTER_PORT_CLVMD       11	/* Cluster LVM daemon */
-#define CLUSTER_PORT_SLM         12	/* LVM SLM (simple lock manager) */
-
-/* Port numbers above this will be blocked when the cluster is inquorate or in
- * transition */
-#define HIGH_PROTECTED_PORT      9
-
-/* Reasons for leaving the cluster */
-#define CLUSTER_LEAVEFLAG_DOWN     0	/* Normal shutdown */
-#define CLUSTER_LEAVEFLAG_KILLED   1
-#define CLUSTER_LEAVEFLAG_PANIC    2
-#define CLUSTER_LEAVEFLAG_REMOVED  3	/* This one can reduce quorum */
-#define CLUSTER_LEAVEFLAG_REJECTED 4	/* Not allowed into the cluster in the
-					 * first place */
-#define CLUSTER_LEAVEFLAG_INCONSISTENT 5	/* Our view of the cluster is
-						 * in a minority */
-#define CLUSTER_LEAVEFLAG_DEAD         6	/* Discovered to be dead */
-#define CLUSTER_LEAVEFLAG_FORCE     0x10	/* Forced by command-line */
-
-/* OOB messages sent to a local socket */
-#define CLUSTER_OOB_MSG_PORTCLOSED  1
-#define CLUSTER_OOB_MSG_STATECHANGE 2
-#define CLUSTER_OOB_MSG_SERVICEEVENT 3
-
-/* Sendmsg flags, these are above the normal sendmsg flags so they don't
- * interfere */
-#define MSG_NOACK     0x010000	/* Don't need an ACK for this message */
-#define MSG_QUEUE     0x020000	/* Queue the message for sending later */
-#define MSG_MULTICAST 0x080000	/* Message was sent to all nodes in the cluster
-				 */
-#define MSG_ALLINT    0x100000	/* Send out of all interfaces */
-#define MSG_REPLYEXP  0x200000	/* Reply is expected */
-
-typedef enum { NODESTATE_REMOTEMEMBER, NODESTATE_JOINING, NODESTATE_MEMBER,
-	       NODESTATE_DEAD } nodestate_t;
-
-
-struct sockaddr_cl {
-	unsigned short scl_family;
-	unsigned char scl_flags;
-	unsigned char scl_port;
-	int           scl_nodeid;
-};
-
-/*
- * This is how we pass the multicast & receive sockets into kernel space.
- */
-struct cl_passed_sock {
-	int fd;			/* FD of master socket to do multicast on */
-	int number;		/* Socket number, to match up recvonly & bcast
-				 * sockets */
-        int multicast;          /* Is it multicast or receive ? */
-};
-
-/* Cluster configuration info passed when we join the cluster */
-struct cl_join_cluster_info {
-	unsigned char votes;
-	unsigned int expected_votes;
-	unsigned int two_node;
-	unsigned int config_version;
-
-        char cluster_name[17];
-};
-
-
-/* This is the structure, per node, returned from the membership ioctl */
-struct cl_cluster_node {
-	unsigned int size;
-	unsigned int node_id;
-	unsigned int us;
-	unsigned int leave_reason;
-	unsigned int incarnation;
-	nodestate_t state;
-	char name[CMAN_MAX_CLUSTER_MEMBER_NAME_LEN];
-	unsigned char votes;
-};
-
-/* The struct passed to the membership ioctls */
-struct cl_cluster_nodelist {
-        uint32_t max_members;
-        struct cl_cluster_node *nodes;
-};
-
-/* Structure passed to SIOCCLUSTER_ISLISTENING */
-struct cl_listen_request {
-	unsigned char port;
-        int           nodeid;
-};
-
-/* A Cluster PORTCLOSED message - received by a local user as an OOB message */
-struct cl_portclosed_oob {
-	unsigned char cmd;	/* CLUSTER_OOB_MSG_PORTCLOSED */
-	unsigned char port;
-};
-
-/* Get all version numbers or set the config version */
-struct cl_version {
-	unsigned int major;
-	unsigned int minor;
-	unsigned int patch;
-	unsigned int config;
-};
-
-/* structure passed to barrier ioctls */
-struct cl_barrier_info {
-	char cmd;
-	char name[MAX_BARRIER_NAME_LEN];
-	unsigned int flags;
-	unsigned long arg;
-};
-
-typedef enum { SERVICE_EVENT_STOP, SERVICE_EVENT_START, SERVICE_EVENT_FINISH,
-		SERVICE_EVENT_LEAVEDONE } service_event_t;
-
-typedef enum { SERVICE_START_FAILED, SERVICE_START_JOIN, SERVICE_START_LEAVE }
-		service_start_t;
-
-struct cl_service_event {
-	service_event_t type;
-	service_start_t start_type;
-	unsigned int event_id;
-	unsigned int last_stop;
-	unsigned int last_start;
-	unsigned int last_finish;
-	unsigned int node_count;
-};
-
-
-/* Commands to the barrier ioctl */
-#define BARRIER_IOCTL_REGISTER 1
-#define BARRIER_IOCTL_CHANGE   2
-#define BARRIER_IOCTL_DELETE   3
-#define BARRIER_IOCTL_WAIT     4
-
-/* Attributes of a barrier - bitmask */
-#define BARRIER_ATTR_AUTODELETE 1
-#define BARRIER_ATTR_MULTISTEP  2
-#define BARRIER_ATTR_MANUAL     4
-#define BARRIER_ATTR_ENABLED    8
-#define BARRIER_ATTR_CALLBACK  16
-
-/* Attribute setting commands */
-#define BARRIER_SETATTR_AUTODELETE 1
-#define BARRIER_SETATTR_MULTISTEP  2
-#define BARRIER_SETATTR_ENABLED    3
-#define BARRIER_SETATTR_NODES      4
-#define BARRIER_SETATTR_CALLBACK   5
-#define BARRIER_SETATTR_TIMEOUT    6
-
-#endif

daemons/clvmd/lvm-functions.c

@@ -1,561 +0,0 @@
-/*
- * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * 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
- */
-
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <errno.h>
-#include <syslog.h>
-#include <assert.h>
-
-#include "libdevmapper.h"
-#include "list.h"
-#include "lvm-types.h"
-#include "libdlm.h"
-#include "clvm.h"
-#include "clvmd-comms.h"
-#include "clvmd.h"
-#include "lvm-functions.h"
-
-/* LVM2 headers */
-#include "toolcontext.h"
-#include "log.h"
-#include "activate.h"
-#include "locking.h"
-#include "defaults.h"
-
-static struct cmd_context *cmd = NULL;
-static struct dm_hash_table *lv_hash = NULL;
-static pthread_mutex_t lv_hash_lock;
-
-struct lv_info {
-	int lock_id;
-	int lock_mode;
-};
-
-/* Return the mode a lock is currently held at (or -1 if not held) */
-static int get_current_lock(char *resource)
-{
-	struct lv_info *lvi;
-
-	pthread_mutex_lock(&lv_hash_lock);
-	lvi = dm_hash_lookup(lv_hash, resource);
-	pthread_mutex_unlock(&lv_hash_lock);
-	if (lvi) {
-		return lvi->lock_mode;
-	} else {
-		return -1;
-	}
-}
-
-/* Called at shutdown to tidy the lockspace */
-void unlock_all()
-{
-	struct dm_hash_node *v;
-
-	pthread_mutex_lock(&lv_hash_lock);
-	dm_hash_iterate(v, lv_hash) {
-		struct lv_info *lvi = dm_hash_get_data(lv_hash, v);
-
-		sync_unlock(dm_hash_get_key(lv_hash, v), lvi->lock_id);
-	}
-	pthread_mutex_unlock(&lv_hash_lock);
-}
-
-/* Gets a real lock and keeps the info in the hash table */
-int hold_lock(char *resource, int mode, int flags)
-{
-	int status;
-	int saved_errno;
-	struct lv_info *lvi;
-
-	flags &= LKF_NOQUEUE;	/* Only LKF_NOQUEUE is valid here */
-
-	pthread_mutex_lock(&lv_hash_lock);
-	lvi = dm_hash_lookup(lv_hash, resource);
-	pthread_mutex_unlock(&lv_hash_lock);
-	if (lvi) {
-		/* Already exists - convert it */
-		status =
-		    sync_lock(resource, mode, LKF_CONVERT | flags,
-			      &lvi->lock_id);
-		saved_errno = errno;
-		if (!status)
-			lvi->lock_mode = mode;
-
-		if (status) {
-			DEBUGLOG("hold_lock. convert to %d failed: %s\n", mode,
-				 strerror(errno));
-		}
-		errno = saved_errno;
-	} else {
-		lvi = malloc(sizeof(struct lv_info));
-		if (!lvi)
-			return -1;
-
-		lvi->lock_mode = mode;
-		status = sync_lock(resource, mode, flags, &lvi->lock_id);
-		saved_errno = errno;
-		if (status) {
-			free(lvi);
-			DEBUGLOG("hold_lock. lock at %d failed: %s\n", mode,
-				 strerror(errno));
-		} else {
-		        pthread_mutex_lock(&lv_hash_lock);
-			dm_hash_insert(lv_hash, resource, lvi);
-			pthread_mutex_unlock(&lv_hash_lock);
-		}
-		errno = saved_errno;
-	}
-	return status;
-}
-
-/* Unlock and remove it from the hash table */
-int hold_unlock(char *resource)
-{
-	struct lv_info *lvi;
-	int status;
-	int saved_errno;
-
-	pthread_mutex_lock(&lv_hash_lock);
-	lvi = dm_hash_lookup(lv_hash, resource);
-	pthread_mutex_unlock(&lv_hash_lock);
-	if (!lvi) {
-		DEBUGLOG("hold_unlock, lock not already held\n");
-		return 0;
-	}
-
-	status = sync_unlock(resource, lvi->lock_id);
-	saved_errno = errno;
-	if (!status) {
-	    	pthread_mutex_lock(&lv_hash_lock);
-		dm_hash_remove(lv_hash, resource);
-		pthread_mutex_unlock(&lv_hash_lock);
-		free(lvi);
-	} else {
-		DEBUGLOG("hold_unlock. unlock failed(%d): %s\n", status,
-			 strerror(errno));
-	}
-
-	errno = saved_errno;
-	return status;
-}
-
-/* Watch the return codes here.
-   liblvm API functions return 1(true) for success, 0(false) for failure and don't set errno.
-   libdlm API functions return 0 for success, -1 for failure and do set errno.
-   These functions here return 0 for success or >0 for failure (where the retcode is errno)
-*/
-
-/* Activate LV exclusive or non-exclusive */
-static int do_activate_lv(char *resource, unsigned char lock_flags, int mode)
-{
-	int oldmode;
-	int status;
-	int activate_lv;
-	int exclusive = 0;
-	struct lvinfo lvi;
-
-	/* Is it already open ? */
-	oldmode = get_current_lock(resource);
-	if (oldmode == mode) {
-		return 0;	/* Nothing to do */
-	}
-
-	/* Does the config file want us to activate this LV ? */
-	if (!lv_activation_filter(cmd, resource, &activate_lv))
-		return EIO;
-
-	if (!activate_lv)
-		return 0;	/* Success, we did nothing! */
-
-	/* Do we need to activate exclusively? */
-	if ((activate_lv == 2) || (mode == LKM_EXMODE)) {
-		exclusive = 1;
-		mode = LKM_EXMODE;
-	}
-
-	/* Try to get the lock if it's a clustered volume group */
-	if (lock_flags & LCK_CLUSTER_VG) {
-		status = hold_lock(resource, mode, LKF_NOQUEUE);
-		if (status)
-			return errno;
-	}
-
-	/* If it's suspended then resume it */
-	if (!lv_info_by_lvid(cmd, resource, &lvi, 0))
-		return EIO;
-
-	if (lvi.suspended)
-		if (!lv_resume(cmd, resource))
-			return EIO;
-
-	/* Now activate it */
-	if (!lv_activate(cmd, resource, exclusive))
-		return EIO;
-
-	return 0;
-}
-
-/* Resume the LV if it was active */
-static int do_resume_lv(char *resource)
-{
-	int oldmode;
-
-	/* Is it open ? */
-	oldmode = get_current_lock(resource);
-	if (oldmode == -1) {
-		DEBUGLOG("do_deactivate_lock, lock not already held\n");
-		return 0;	/* We don't need to do anything */
-	}
-
-	if (!lv_resume_if_active(cmd, resource))
-		return EIO;
-
-	return 0;
-}
-
-/* Suspend the device if active */
-static int do_suspend_lv(char *resource)
-{
-	int oldmode;
-	struct lvinfo lvi;
-
-	/* Is it open ? */
-	oldmode = get_current_lock(resource);
-	if (oldmode == -1) {
-		DEBUGLOG("do_suspend_lv, lock held at %d\n", oldmode);
-		return 0; /* Not active, so it's OK */
-	}
-
-	/* Only suspend it if it exists */
-	if (!lv_info_by_lvid(cmd, resource, &lvi, 0))
-		return EIO;
-
-	if (lvi.exists) {
-		if (!lv_suspend_if_active(cmd, resource)) {
-			return EIO;
-		}
-	}
-	return 0;
-}
-
-static int do_deactivate_lv(char *resource, unsigned char lock_flags)
-{
-	int oldmode;
-	int status;
-
-	/* Is it open ? */
-	oldmode = get_current_lock(resource);
-	if (oldmode == -1 && (lock_flags & LCK_CLUSTER_VG)) {
-		DEBUGLOG("do_deactivate_lock, lock not already held\n");
-		return 0;	/* We don't need to do anything */
-	}
-
-	if (!lv_deactivate(cmd, resource))
-		return EIO;
-
-	if (lock_flags & LCK_CLUSTER_VG) {
-		status = hold_unlock(resource);
-		if (status)
-			return errno;
-	}
-
-	return 0;
-}
-
-/* This is the LOCK_LV part that happens on all nodes in the cluster -
-   it is responsible for the interaction with device-mapper and LVM */
-int do_lock_lv(unsigned char command, unsigned char lock_flags, char *resource)
-{
-	int status = 0;
-
-	DEBUGLOG("do_lock_lv: resource '%s', cmd = 0x%x, flags = %x\n",
-		 resource, command, lock_flags);
-
-	if (!cmd->config_valid || config_files_changed(cmd)) {
-		/* Reinitialise various settings inc. logging, filters */
-		if (!refresh_toolcontext(cmd)) {
-			log_error("Updated config file invalid. Aborting.");
-			return EINVAL;
-		}
-	}
-
-	if (lock_flags & LCK_PARTIAL_MODE)
-		init_partial(1);
-
-	if (lock_flags & LCK_MIRROR_NOSYNC_MODE)
-		init_mirror_in_sync(1);
-
-	if (!(lock_flags & LCK_DMEVENTD_REGISTER_MODE))
-		init_dmeventd_register(0);
-
-	switch (command) {
-	case LCK_LV_EXCLUSIVE:
-		status = do_activate_lv(resource, lock_flags, LKM_EXMODE);
-		break;
-
-	case LCK_LV_SUSPEND:
-		status = do_suspend_lv(resource);
-		break;
-
-	case LCK_UNLOCK:
-	case LCK_LV_RESUME:	/* if active */
-		status = do_resume_lv(resource);
-		break;
-
-	case LCK_LV_ACTIVATE:
-		status = do_activate_lv(resource, lock_flags, LKM_CRMODE);
-		break;
-
-	case LCK_LV_DEACTIVATE:
-		status = do_deactivate_lv(resource, lock_flags);
-		break;
-
-	default:
-		DEBUGLOG("Invalid LV command 0x%x\n", command);
-		status = EINVAL;
-		break;
-	}
-
-	if (lock_flags & LCK_PARTIAL_MODE)
-		init_partial(0);
-
-	if (lock_flags & LCK_MIRROR_NOSYNC_MODE)
-		init_mirror_in_sync(0);
-
-	if (!(lock_flags & LCK_DMEVENTD_REGISTER_MODE))
-		init_dmeventd_register(DEFAULT_DMEVENTD_MONITOR);
-
-	/* clean the pool for another command */
-	dm_pool_empty(cmd->mem);
-
-	DEBUGLOG("Command return is %d\n", status);
-	return status;
-}
-
-/* Functions to do on the local node only BEFORE the cluster-wide stuff above happens */
-int pre_lock_lv(unsigned char command, unsigned char lock_flags, char *resource)
-{
-	/* Nearly all the stuff happens cluster-wide. Apart from SUSPEND. Here we get the
-	   lock out on this node (because we are the node modifying the metadata)
-	   before suspending cluster-wide.
-	 */
-	if (command == LCK_LV_SUSPEND) {
-		DEBUGLOG("pre_lock_lv: resource '%s', cmd = 0x%x, flags = %d\n",
-			 resource, command, lock_flags);
-
-		if (hold_lock(resource, LKM_PWMODE, LKF_NOQUEUE))
-			return errno;
-	}
-	return 0;
-}
-
-/* Functions to do on the local node only AFTER the cluster-wide stuff above happens */
-int post_lock_lv(unsigned char command, unsigned char lock_flags,
-		 char *resource)
-{
-	/* Opposite of above, done on resume after a metadata update */
-	if (command == LCK_LV_RESUME) {
-		int oldmode;
-
-		DEBUGLOG
-		    ("post_lock_lv: resource '%s', cmd = 0x%x, flags = %d\n",
-		     resource, command, lock_flags);
-
-		/* If the lock state is PW then restore it to what it was */
-		oldmode = get_current_lock(resource);
-		if (oldmode == LKM_PWMODE) {
-			struct lvinfo lvi;
-
-			if (!lv_info_by_lvid(cmd, resource, &lvi, 0))
-				return EIO;
-
-			if (lvi.exists) {
-				if (hold_lock(resource, LKM_CRMODE, 0))
-					return errno;
-			} else {
-				if (hold_unlock(resource))
-					return errno;
-			}
-		}
-	}
-	return 0;
-}
-
-/* Check if a VG is un use by LVM1 so we don't stomp on it */
-int do_check_lvm1(char *vgname)
-{
-	int status;
-
-	status = check_lvm1_vg_inactive(cmd, vgname);
-
-	return status == 1 ? 0 : EBUSY;
-}
-
-
-/* Only called at gulm startup. Drop any leftover VG or P_orphan locks
-   that might be hanging around if we died for any reason
-*/
-static void drop_vg_locks()
-{
-	char vg[128];
-	char line[255];
-	FILE *vgs =
-	    popen
-	    ("lvm pvs --nolocking --noheadings -o vg_name", "r");
-
-	sync_unlock("P_orphans", LCK_EXCL);
-
-	if (!vgs)
-		return;
-
-	while (fgets(line, sizeof(line), vgs)) {
-		char *vgend;
-		char *vgstart;
-
-		if (line[strlen(line)-1] == '\n')
-			line[strlen(line)-1] = '\0';
-
-		vgstart = line + strspn(line, " ");
-		vgend = vgstart + strcspn(vgstart, " ");
-		*vgend = '\0';
-
-		if (strncmp(vgstart, "WARNING:", 8) == 0)
-			continue;
-
-		sprintf(vg, "V_%s", vgstart);
-		sync_unlock(vg, LCK_EXCL);
-
-	}
-	fclose(vgs);
-}
-
-/*
- * Ideally, clvmd should be started before any LVs are active
- * but this may not be the case...
- * I suppose this also comes in handy if clvmd crashes, not that it would!
- */
-static void *get_initial_state()
-{
-	char lv[64], vg[64], flags[25], vg_flags[25];
-	char uuid[65];
-	char line[255];
-	FILE *lvs =
-	    popen
-	    ("lvm lvs --nolocking --noheadings -o vg_uuid,lv_uuid,lv_attr,vg_attr",
-	     "r");
-
-	if (!lvs)
-		return NULL;
-
-	while (fgets(line, sizeof(line), lvs)) {
-	        if (sscanf(line, "%s %s %s %s\n", vg, lv, flags, vg_flags) == 4) {
-
-			/* States: s:suspended a:active S:dropped snapshot I:invalid snapshot */
-		        if (strlen(vg) == 38 &&                         /* is is a valid UUID ? */
-			    (flags[4] == 'a' || flags[4] == 's') &&	/* is it active or suspended? */
-			    vg_flags[5] == 'c') {			/* is it clustered ? */
-				/* Convert hyphen-separated UUIDs into one */
-				memcpy(&uuid[0], &vg[0], 6);
-				memcpy(&uuid[6], &vg[7], 4);
-				memcpy(&uuid[10], &vg[12], 4);
-				memcpy(&uuid[14], &vg[17], 4);
-				memcpy(&uuid[18], &vg[22], 4);
-				memcpy(&uuid[22], &vg[27], 4);
-				memcpy(&uuid[26], &vg[32], 6);
-				memcpy(&uuid[32], &lv[0], 6);
-				memcpy(&uuid[38], &lv[7], 4);
-				memcpy(&uuid[42], &lv[12], 4);
-				memcpy(&uuid[46], &lv[17], 4);
-				memcpy(&uuid[50], &lv[22], 4);
-				memcpy(&uuid[54], &lv[27], 4);
-				memcpy(&uuid[58], &lv[32], 6);
-				uuid[64] = '\0';
-
-				DEBUGLOG("getting initial lock for %s\n", uuid);
-				hold_lock(uuid, LKM_CRMODE, LKF_NOQUEUE);
-			}
-		}
-	}
-	fclose(lvs);
-	return NULL;
-}
-
-/* This checks some basic cluster-LVM configuration stuff */
-static void check_config()
-{
-	int locking_type;
-
-	locking_type = find_config_tree_int(cmd, "global/locking_type", 1);
-
-	if (locking_type == 3) /* compiled-in cluster support */
-		return;
-
-	if (locking_type == 2) { /* External library, check name */
-		const char *libname;
-
-		libname = find_config_tree_str(cmd, "global/locking_library",
-					  "");
-		if (strstr(libname, "liblvm2clusterlock.so"))
-			return;
-
-		log_error("Incorrect LVM locking library specified in lvm.conf, cluster operations may not work.");
-		return;
-	}
-	log_error("locking_type not set correctly in lvm.conf, cluster operations will not work.");
-}
-
-void init_lvhash()
-{
-	/* Create hash table for keeping LV locks & status */
-	lv_hash = dm_hash_create(100);
-	pthread_mutex_init(&lv_hash_lock, NULL);
-}
-
-/* Called to initialise the LVM context of the daemon */
-int init_lvm(int using_gulm)
-{
-	if (!(cmd = create_toolcontext(NULL))) {
-		log_error("Failed to allocate command context");
-		return 0;
-	}
-
-	/* Use LOG_DAEMON for syslog messages instead of LOG_USER */
-	init_syslog(LOG_DAEMON);
-	init_debug(_LOG_ERR);
-
-	/* Check lvm.conf is setup for cluster-LVM */
-	check_config();
-
-	/* Remove any non-LV locks that may have been left around */
-	if (using_gulm)
-		drop_vg_locks();
-
-	get_initial_state();
-
-	return 1;
-}

daemons/clvmd/lvm-functions.h

@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * 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
- */
-
-/* Functions in lvm-functions.c */
-
-#ifndef _LVM_FUNCTIONS_H
-#define _LVM_FUNCTIONS_H
-
-extern int pre_lock_lv(unsigned char lock_cmd, unsigned char lock_flags,
-		       char *resource);
-extern int do_lock_lv(unsigned char lock_cmd, unsigned char lock_flags,
-		      char *resource);
-extern int post_lock_lv(unsigned char lock_cmd, unsigned char lock_flags,
-			char *resource);
-extern int do_check_lvm1(char *vgname);
-extern int init_lvm(int using_gulm);
-extern void init_lvhash(void);
-
-extern int hold_unlock(char *resource);
-extern int hold_lock(char *resource, int mode, int flags);
-extern void unlock_all(void);
-
-#endif

daemons/clvmd/system-lv.c

@@ -1,371 +0,0 @@
-/*
- * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * 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
- */
-
-/* Routines dealing with the System LV */
-
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <sys/mount.h>
-#include <sys/utsname.h>
-#include <syslog.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <signal.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <errno.h>
-#include <mntent.h>
-
-#include "libdlm.h"
-#include "log.h"
-#include "list.h"
-#include "locking.h"
-#include "system-lv.h"
-#include "clvm.h"
-#include "clvmd-comms.h"
-#include "clvmd.h"
-#ifdef HAVE_CCS
-#include "ccs.h"
-#endif
-
-#define SYSTEM_LV_FILESYSTEM "ext2"
-#define SYSTEM_LV_MOUNTPOINT "/tmp/.clvmd-XXXXXX"
-
-extern char *config_filename(void);
-
-static char system_lv_name[PATH_MAX] = { '\0' };
-static char mount_point[PATH_MAX] = { '\0' };
-static int mounted = 0;
-static int mounted_rw = 0;
-static int lockid;
-static const char *lock_name = "CLVM_SYSTEM_LV";
-
-/* Look in /proc/mounts or (as a last resort) /etc/mtab to
-   see if the system-lv is mounted. If it is mounted and we
-   think it's not then abort because we don't have the right
-   lock status and we don't know what other processes are doing with it.
-
-   Returns 1 for mounted, 0 for not mounted so it matches the condition
-   of the "mounted" static variable above.
-*/
-static int is_really_mounted(void)
-{
-	FILE *mountfile;
-	struct mntent *ment;
-
-	mountfile = setmntent("/proc/mounts", "r");
-	if (!mountfile) {
-		mountfile = setmntent("/etc/mtab", "r");
-		if (!mountfile) {
-			log_error("Unable to open /proc/mounts or /etc/mtab");
-			return -1;
-		}
-	}
-
-	/* Look for system LV name in the file */
-	do {
-		ment = getmntent(mountfile);
-		if (ment) {
-			if (strcmp(ment->mnt_fsname, system_lv_name) == 0) {
-				endmntent(mountfile);
-				return 1;
-			}
-		}
-	}
-	while (ment);
-
-	endmntent(mountfile);
-	return 0;
-}
-
-/* Get the system LV name from the config file */
-static int find_system_lv(void)
-{
-	if (system_lv_name[0] == '\0') {
-#ifdef HAVE_CCS
-		int error;
-		ccs_node_t *ctree;
-
-		/* Read the cluster config file */
-		/* Open the config file */
-		error = open_ccs_file(&ctree, "clvm.ccs");
-		if (error) {
-			perror("reading config file");
-			return -1;
-		}
-
-		strcpy(system_lv_name, find_ccs_str(ctree,
-						    "cluster/systemlv", '/',
-						    "/dev/vg/system_lv"));
-
-		/* Finished with config file */
-		close_ccs_file(ctree);
-#else
-		if (getenv("CLVMD_SYSTEM_LV"))
-			strcpy(system_lv_name, getenv("CLVMD_SYSTEM_LV"));
-		else
-			return -1;
-#endif
-	}
-
-	/* See if it has been mounted outside our control */
-	if (is_really_mounted() != mounted) {
-		log_error
-		    ("The system LV state has been mounted/umounted outside the control of clvmd\n"
-		     "it cannot not be used for cluster communications until this is fixed.\n");
-		return -1;
-	}
-	return 0;
-}
-
-/* No prizes */
-int system_lv_umount(void)
-{
-	if (!mounted)
-		return 0;
-
-	if (umount(mount_point) < 0) {
-		log_error("umount of system LV (%s) failed: %m\n",
-			  system_lv_name);
-		return -1;
-	}
-
-	sync_unlock(lock_name, lockid);
-	mounted = 0;
-
-	/* Remove the mount point */
-	rmdir(mount_point);
-
-	return 0;
-}
-
-int system_lv_mount(int readwrite)
-{
-	int status;
-	int saved_errno;
-	int fd;
-
-	if (find_system_lv()) {
-		errno = EBUSY;
-		return -1;
-	}
-
-	/* Is it already mounted suitably? */
-	if (mounted) {
-		if (!readwrite || (readwrite && mounted_rw)) {
-			return 0;
-		} else {
-			/* Mounted RO and we need RW */
-			if (system_lv_umount() < 0)
-				return -1;
-		}
-	}
-
-	/* Randomize the mount point */
-	strcpy(mount_point, SYSTEM_LV_MOUNTPOINT);
-	fd = mkstemp(mount_point);
-	if (fd < 0) {
-		log_error("mkstemp for system LV mount point failed: %m\n");
-		return -1;
-	}
-
-	/* Race condition here but there's no mkstemp for directories */
-	close(fd);
-	unlink(mount_point);
-	mkdir(mount_point, 0600);
-
-	/* Make sure we have a system-lv lock */
-	status =
-	    sync_lock(lock_name, (readwrite) ? LKM_EXMODE : LKM_CRMODE, 0,
-		      &lockid);
-	if (status < 0)
-		return -1;
-
-	/* Mount it */
-	if (mount(system_lv_name, mount_point, SYSTEM_LV_FILESYSTEM,
-		  MS_MGC_VAL | MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_SYNCHRONOUS
-		  | (readwrite ? 0 : MS_RDONLY), NULL) < 0) {
-		/* mount(2) returns EINVAL if the volume has no FS on it. So, if we want to
-		   write to it we try to make a filesystem in it and retry the mount */
-		if (errno == EINVAL && readwrite) {
-			char cmd[256];
-
-			log_error("Attempting mkfs on system LV device %s\n",
-				  system_lv_name);
-			snprintf(cmd, sizeof(cmd), "/sbin/mkfs -t %s %s",
-				 SYSTEM_LV_FILESYSTEM, system_lv_name);
-			system(cmd);
-
-			if (mount
-			    (system_lv_name, mount_point, SYSTEM_LV_FILESYSTEM,
-			     MS_MGC_VAL | MS_NOSUID | MS_NODEV | MS_NOEXEC |
-			     MS_SYNCHRONOUS | (readwrite ? 0 : MS_RDONLY),
-			     NULL) == 0)
-				goto mounted;
-		}
-
-		saved_errno = errno;
-		log_error("mount of system LV (%s, %s, %s) failed: %m\n",
-			  system_lv_name, mount_point, SYSTEM_LV_FILESYSTEM);
-		sync_unlock(lock_name, lockid);
-		errno = saved_errno;
-		return -1;
-	}
-
-      mounted:
-/* Set the internal flags */
-	mounted = 1;
-	mounted_rw = readwrite;
-
-	return 0;
-}
-
-/* Erase *all* files in the root directory of the system LV.
-   This *MUST* be called with an appropriate lock held!
-   The LV is left mounted RW because it is assumed that the
-   caller wants to write something here after clearing some space */
-int system_lv_eraseall(void)
-{
-	DIR *dir;
-	struct dirent *ent;
-	char fname[PATH_MAX];
-
-	/* Must be mounted R/W */
-	system_lv_mount(1);
-
-	dir = opendir(mount_point);
-	if (!dir)
-		return -1;
-
-	while ((ent = readdir(dir))) {
-		struct stat st;
-		snprintf(fname, sizeof(fname), "%s/%s", mount_point,
-			 ent->d_name);
-
-		if (stat(fname, &st)) {
-			if (S_ISREG(st.st_mode))
-				unlink(fname);
-		}
-	}
-	closedir(dir);
-	return 0;
-}
-
-/* This is a "high-level" routine - it mounts the system LV, writes
-   the data into a file named after this node and then umounts the LV
-   again */
-int system_lv_write_data(char *data, ssize_t len)
-{
-	struct utsname nodeinfo;
-	char fname[PATH_MAX];
-	int outfile;
-	ssize_t thiswrite;
-	ssize_t written;
-
-	if (system_lv_mount(1))
-		return -1;
-
-	/* Build the file name we are goingto use. */
-	uname(&nodeinfo);
-	snprintf(fname, sizeof(fname), "%s/%s", mount_point, nodeinfo.nodename);
-
-	/* Open the file for output */
-	outfile = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0600);
-	if (outfile < 0) {
-		int saved_errno = errno;
-		system_lv_umount();
-		errno = saved_errno;
-		return -1;
-	}
-
-	written = 0;
-	do {
-		thiswrite = write(outfile, data + written, len - written);
-		if (thiswrite > 0)
-			written += thiswrite;
-
-	} while (written < len && thiswrite > 0);
-
-	close(outfile);
-
-	system_lv_umount();
-	return (thiswrite < 0) ? -1 : 0;
-}
-
-/* This is a "high-level" routine - it mounts the system LV, reads
-   the data from a named file and then umounts the LV
-   again */
-int system_lv_read_data(char *fname_base, char *data, ssize_t *len)
-{
-	char fname[PATH_MAX];
-	int outfile;
-	struct stat st;
-	ssize_t filesize;
-	ssize_t thisread;
-	ssize_t readbytes;
-
-	if (system_lv_mount(0))
-		return -1;
-
-	/* Build the file name we are going to use. */
-	snprintf(fname, sizeof(fname), "%s/%s", mount_point, fname_base);
-
-	/* Get the file size and stuff. Actually we only need the file size but
-	   this will also check that the file exists */
-	if (stat(fname, &st) < 0) {
-		int saved_errno = errno;
-
-		log_error("stat of file %s on system LV failed: %m\n", fname);
-		system_lv_umount();
-		errno = saved_errno;
-		return -1;
-	}
-	filesize = st.st_size;
-
-	outfile = open(fname, O_RDONLY);
-	if (outfile < 0) {
-		int saved_errno = errno;
-
-		log_error("open of file %s on system LV failed: %m\n", fname);
-		system_lv_umount();
-		errno = saved_errno;
-		return -1;
-	}
-
-	readbytes = 0;
-	do {
-		thisread =
-		    read(outfile, data + readbytes, filesize - readbytes);
-		if (thisread > 0)
-			readbytes += thisread;
-
-	} while (readbytes < filesize && thisread > 0);
-
-	close(outfile);
-
-	system_lv_umount();
-
-	*len = readbytes;
-	return (thisread < 0) ? -1 : 0;
-}

daemons/clvmd/system-lv.h

@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * 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
- */
-
-#ifndef _CLVM_SYSTEM_LV_H
-#define _CLVM_SYSTEM_LV_H
-
-/* Prototypes for System-LV functions */
-
-/* "low-level" functions */
-extern int system_lv_umount(void);
-extern int system_lv_mount(int readwrite);
-extern int system_lv_eraseall(void);
-
-/* "high-level" functions */
-extern int system_lv_write_data(char *data, ssize_t len);
-extern int system_lv_read_data(char *fname_base, char *data, ssize_t *len);
-
-#endif

daemons/clvmd/tcp-comms.c

@@ -1,505 +0,0 @@
-/******************************************************************************
-*******************************************************************************
-**
-**  Copyright (C) Sistina Software, Inc.  2002-2003  All rights reserved.
-**  Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
-**
-*******************************************************************************
-******************************************************************************/
-
-/* This provides the inter-clvmd communications for a system without CMAN.
-   There is a listening TCP socket which accepts new connections in the
-   normal way.
-   It can also make outgoing connnections to the other clvmd nodes.
-*/
-
-
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <errno.h>
-#include <syslog.h>
-#include <netdb.h>
-#include <assert.h>
-
-#include "libdevmapper.h"
-#include "clvm.h"
-#include "clvmd-comms.h"
-#include "clvmd.h"
-#include "clvmd-gulm.h"
-
-#define DEFAULT_TCP_PORT 21064
-
-static int listen_fd = -1;
-static int tcp_port;
-struct dm_hash_table *sock_hash;
-
-static int get_our_ip_address(char *addr, int *family);
-static int read_from_tcpsock(struct local_client *fd, char *buf, int len, char *csid,
-			     struct local_client **new_client);
-
-/* Called by init_cluster() to open up the listening socket */
-int init_comms(unsigned short port)
-{
-    struct sockaddr_in6 addr;
-
-    sock_hash = dm_hash_create(100);
-    tcp_port = port ? : DEFAULT_TCP_PORT;
-
-    listen_fd = socket(AF_INET6, SOCK_STREAM, 0);
-
-    if (listen_fd < 0)
-    {
-	return -1;
-    }
-    else
-    {
-	int one = 1;
-	setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(int));
-	setsockopt(listen_fd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(int));
-    }
-
-    memset(&addr, 0, sizeof(addr)); // Bind to INADDR_ANY
-    addr.sin6_family = AF_INET6;
-    addr.sin6_port = htons(tcp_port);
-
-    if (bind(listen_fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
-    {
-	DEBUGLOG("Can't bind to port: %s\n", strerror(errno));
-	syslog(LOG_ERR, "Can't bind to port %d, is clvmd already running ?", tcp_port);
-	close(listen_fd);
-	return -1;
-    }
-
-    listen(listen_fd, 5);
-
-    /* Set Close-on-exec */
-    fcntl(listen_fd, F_SETFD, 1);
-
-    return 0;
-}
-
-void tcp_remove_client(char *csid)
- {
-    struct local_client *client;
-    DEBUGLOG("tcp_remove_client\n");
-
-    /* Don't actually close the socket here - that's the
-       job of clvmd.c whch will do the job when it notices the
-       other end has gone. We just need to remove the client(s) from
-       the hash table so we don't try to use it for sending any more */
-    client = dm_hash_lookup_binary(sock_hash, csid, GULM_MAX_CSID_LEN);
-    if (client)
-    {
-	dm_hash_remove_binary(sock_hash, csid, GULM_MAX_CSID_LEN);
-	client->removeme = 1;
-	close(client->fd);
-    }
-
-    /* Look for a mangled one too */
-    csid[0] ^= 0x80;
-
-    client = dm_hash_lookup_binary(sock_hash, csid, GULM_MAX_CSID_LEN);
-    if (client)
-    {
-	dm_hash_remove_binary(sock_hash, csid, GULM_MAX_CSID_LEN);
-	client->removeme = 1;
-	close(client->fd);
-    }
-
-    /* Put it back as we found it */
-    csid[0] ^= 0x80;
-}
-
-int alloc_client(int fd, char *csid, struct local_client **new_client)
-{
-    struct local_client *client;
-
-    DEBUGLOG("alloc_client %d csid = %s\n", fd, print_csid(csid));
-
-    /* Create a local_client and return it */
-    client = malloc(sizeof(struct local_client));
-    if (!client)
-    {
-	DEBUGLOG("malloc failed\n");
-	return -1;
-    }
-
-    memset(client, 0, sizeof(struct local_client));
-    client->fd = fd;
-    client->type = CLUSTER_DATA_SOCK;
-    client->callback = read_from_tcpsock;
-    if (new_client)
-	*new_client = client;
-
-    /* Add to our list of node sockets */
-    if (dm_hash_lookup_binary(sock_hash, csid, GULM_MAX_CSID_LEN))
-    {
-	DEBUGLOG("alloc_client mangling CSID for second connection\n");
-	/* This is a duplicate connection but we can't close it because
-	   the other end may already have started sending.
-	   So, we mangle the IP address and keep it, all sending will
-	   go out of the main FD
-	*/
-	csid[0] ^= 0x80;
-	client->bits.net.flags = 1; /* indicate mangled CSID */
-
-        /* If it still exists then kill the connection as we should only
-           ever have one incoming connection from each node */
-        if (dm_hash_lookup_binary(sock_hash, csid, GULM_MAX_CSID_LEN))
-        {
-	    DEBUGLOG("Multiple incoming connections from node\n");
-            syslog(LOG_ERR, " Bogus incoming connection from %d.%d.%d.%d\n", csid[0],csid[1],csid[2],csid[3]);
-
-	    free(client);
-            errno = ECONNREFUSED;
-            return -1;
-        }
-    }
-    dm_hash_insert_binary(sock_hash, csid, GULM_MAX_CSID_LEN, client);
-
-    return 0;
-}
-
-int get_main_gulm_cluster_fd()
-{
-    return listen_fd;
-}
-
-
-/* Read on main comms (listen) socket, accept it */
-int cluster_fd_gulm_callback(struct local_client *fd, char *buf, int len, char *csid,
-			struct local_client **new_client)
-{
-    int newfd;
-    struct sockaddr_in6 addr;
-    socklen_t addrlen = sizeof(addr);
-    int status;
-    char name[GULM_MAX_CLUSTER_MEMBER_NAME_LEN];
-
-    DEBUGLOG("cluster_fd_callback\n");
-    *new_client = NULL;
-    newfd = accept(listen_fd, (struct sockaddr *)&addr, &addrlen);
-
-    DEBUGLOG("cluster_fd_callback, newfd=%d (errno=%d)\n", newfd, errno);
-    if (!newfd)
-    {
-	syslog(LOG_ERR, "error in accept: %m");
-	errno = EAGAIN;
-	return -1; /* Don't return an error or clvmd will close the listening FD */
-    }
-
-    /* Check that the client is a member of the cluster
-       and reject if not.
-    */
-    if (gulm_name_from_csid((char *)&addr.sin6_addr, name) < 0)
-    {
-	syslog(LOG_ERR, "Got connect from non-cluster node %s\n",
-	       print_csid((char *)&addr.sin6_addr));
-	DEBUGLOG("Got connect from non-cluster node %s\n",
-		 print_csid((char *)&addr.sin6_addr));
-	close(newfd);
-
-	errno = EAGAIN;
-	return -1;
-    }
-
-    status = alloc_client(newfd, (char *)&addr.sin6_addr, new_client);
-    if (status)
-    {
-	DEBUGLOG("cluster_fd_callback, alloc_client failed, status = %d\n", status);
-	close(newfd);
-	/* See above... */
-	errno = EAGAIN;
-	return -1;
-    }
-    DEBUGLOG("cluster_fd_callback, returning %d, %p\n", newfd, *new_client);
-    return newfd;
-}
-
-/* Try to get at least 'len' bytes from the socket */
-static int really_read(int fd, char *buf, int len)
-{
-	int got, offset;
-
-	got = offset = 0;
-
-	do {
-		got = read(fd, buf+offset, len-offset);
-		DEBUGLOG("really_read. got %d bytes\n", got);
-		offset += got;
-	} while (got > 0 && offset < len);
-
-	if (got < 0)
-		return got;
-	else
-		return offset;
-}
-
-
-static int read_from_tcpsock(struct local_client *client, char *buf, int len, char *csid,
-			     struct local_client **new_client)
-{
-    struct sockaddr_in6 addr;
-    socklen_t slen = sizeof(addr);
-    struct clvm_header *header = (struct clvm_header *)buf;
-    int status;
-    uint32_t arglen;
-
-    DEBUGLOG("read_from_tcpsock fd %d\n", client->fd);
-    *new_client = NULL;
-
-    /* Get "csid" */
-    getpeername(client->fd, (struct sockaddr *)&addr, &slen);
-    memcpy(csid, &addr.sin6_addr, GULM_MAX_CSID_LEN);
-
-    /* Read just the header first, then get the rest if there is any.
-     * Stream sockets, sigh.
-     */
-    status = really_read(client->fd, buf, sizeof(struct clvm_header));
-    if (status > 0)
-    {
-	    int status2;
-
-	    arglen = ntohl(header->arglen);
-
-	    /* Get the rest */
-	    if (arglen && arglen < GULM_MAX_CLUSTER_MESSAGE)
-	    {
-		    status2 = really_read(client->fd, buf+status, arglen);
-		    if (status2 > 0)
-			    status += status2;
-		    else
-			    status = status2;
-	    }
-    }
-
-    DEBUGLOG("read_from_tcpsock, status = %d(errno = %d)\n", status, errno);
-
-    /* Remove it from the hash table if there's an error, clvmd will
-       remove the socket from its lists and free the client struct */
-    if (status == 0 ||
-	(status < 0 && errno != EAGAIN && errno != EINTR))
-    {
-	char remcsid[GULM_MAX_CSID_LEN];
-
-	memcpy(remcsid, csid, GULM_MAX_CSID_LEN);
-	close(client->fd);
-
-	/* If the csid was mangled, then make sure we remove the right entry */
-	if (client->bits.net.flags)
-	    remcsid[0] ^= 0x80;
-	dm_hash_remove_binary(sock_hash, remcsid, GULM_MAX_CSID_LEN);
-
-	/* Tell cluster manager layer */
-	add_down_node(remcsid);
-    }
-    else {
-	    gulm_add_up_node(csid);
-	    /* Send it back to clvmd */
-	    process_message(client, buf, status, csid);
-    }
-    return status;
-}
-
-int gulm_connect_csid(char *csid, struct local_client **newclient)
-{
-    int fd;
-    struct sockaddr_in6 addr;
-    int status;
-    int one = 1;
-
-    DEBUGLOG("Connecting socket\n");
-    fd = socket(PF_INET6, SOCK_STREAM, 0);
-
-    if (fd < 0)
-    {
-	syslog(LOG_ERR, "Unable to create new socket: %m");
-	return -1;
-    }
-
-    addr.sin6_family = AF_INET6;
-    memcpy(&addr.sin6_addr, csid, GULM_MAX_CSID_LEN);
-    addr.sin6_port = htons(tcp_port);
-
-    DEBUGLOG("Connecting socket %d\n", fd);
-    if (connect(fd, (struct sockaddr *)&addr, sizeof(struct sockaddr_in6)) < 0)
-    {
-	/* "Connection refused" is "normal" because clvmd may not yet be running
-	 * on that node.
-	 */
-	if (errno != ECONNREFUSED)
-	{
-	    syslog(LOG_ERR, "Unable to connect to remote node: %m");
-	}
-	DEBUGLOG("Unable to connect to remote node: %s\n", strerror(errno));
-	close(fd);
-	return -1;
-    }
-
-    /* Set Close-on-exec */
-    fcntl(fd, F_SETFD, 1);
-    setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(int));
-
-    status = alloc_client(fd, csid, newclient);
-    if (status)
-	close(fd);
-    else
-	add_client(*newclient);
-
-    /* If we can connect to it, it must be running a clvmd */
-    gulm_add_up_node(csid);
-    return status;
-}
-
-/* Send a message to a known CSID */
-static int tcp_send_message(void *buf, int msglen, unsigned char *csid, const char *errtext)
-{
-    int status;
-    struct local_client *client;
-    char ourcsid[GULM_MAX_CSID_LEN];
-
-    assert(csid);
-
-    DEBUGLOG("tcp_send_message, csid = %s, msglen = %d\n", print_csid(csid), msglen);
-
-    /* Don't connect to ourself */
-    get_our_gulm_csid(ourcsid);
-    if (memcmp(csid, ourcsid, GULM_MAX_CSID_LEN) == 0)
-	return msglen;
-
-    client = dm_hash_lookup_binary(sock_hash, csid, GULM_MAX_CSID_LEN);
-    if (!client)
-    {
-	status = gulm_connect_csid(csid, &client);
-	if (status)
-	    return -1;
-    }
-    DEBUGLOG("tcp_send_message, fd = %d\n", client->fd);
-
-    return write(client->fd, buf, msglen);
-}
-
-
-int gulm_cluster_send_message(void *buf, int msglen, char *csid, const char *errtext)
-{
-    int status=0;
-
-    DEBUGLOG("cluster send message, csid = %p, msglen = %d\n", csid, msglen);
-
-    /* If csid is NULL then send to all known (not just connected) nodes */
-    if (!csid)
-    {
-	void *context = NULL;
-	char loop_csid[GULM_MAX_CSID_LEN];
-
-	/* Loop round all gulm-known nodes */
-	while (get_next_node_csid(&context, loop_csid))
-	{
-	    status = tcp_send_message(buf, msglen, loop_csid, errtext);
-	    if (status == 0 ||
-		(status < 0 && (errno == EAGAIN || errno == EINTR)))
-		break;
-	}
-    }
-    else
-    {
-
-	status = tcp_send_message(buf, msglen, csid, errtext);
-    }
-    return status;
-}
-
-/* To get our own IP address we get the locally bound address of the
-   socket that's talking to GULM in the assumption(eek) that it will
-   be on the "right" network in a multi-homed system */
-static int get_our_ip_address(char *addr, int *family)
-{
-	struct utsname info;
-
-	uname(&info);
-	get_ip_address(info.nodename, addr);
-
-	return 0;
-}
-
-/* Public version of above for those that don't care what protocol
-   we're using */
-void get_our_gulm_csid(char *csid)
-{
-    static char our_csid[GULM_MAX_CSID_LEN];
-    static int got_csid = 0;
-
-    if (!got_csid)
-    {
-	int family;
-
-	memset(our_csid, 0, sizeof(our_csid));
-	if (get_our_ip_address(our_csid, &family))
-	{
-	    got_csid = 1;
-	}
-    }
-    memcpy(csid, our_csid, GULM_MAX_CSID_LEN);
-}
-
-static void map_v4_to_v6(struct in_addr *ip4, struct in6_addr *ip6)
-{
-   ip6->s6_addr32[0] = 0;
-   ip6->s6_addr32[1] = 0;
-   ip6->s6_addr32[2] = htonl(0xffff);
-   ip6->s6_addr32[3] = ip4->s_addr;
-}
-
-/* Get someone else's IP address from DNS */
-int get_ip_address(char *node, char *addr)
-{
-    struct hostent *he;
-
-    memset(addr, 0, GULM_MAX_CSID_LEN);
-
-    // TODO: what do we do about multi-homed hosts ???
-    // CCSs ip_interfaces solved this but some bugger removed it.
-
-    /* Try IPv6 first. The man page for gethostbyname implies that
-       it will lookup ip6 & ip4 names, but it seems not to */
-    he = gethostbyname2(node, AF_INET6);
-    if (he)
-    {
-	memcpy(addr, he->h_addr_list[0],
-	       he->h_length);
-    }
-    else
-    {
-	he = gethostbyname2(node, AF_INET);
-	if (!he)
-	    return -1;
-	map_v4_to_v6((struct in_addr *)he->h_addr_list[0], (struct in6_addr *)addr);
-    }
-
-    return 0;
-}
-
-char *print_csid(char *csid)
-{
-    static char buf[128];
-    int *icsid = (int *)csid;
-
-    sprintf(buf, "[%x.%x.%x.%x]",
-	    icsid[0],icsid[1],icsid[2],icsid[3]);
-
-    return buf;
-}

daemons/clvmd/tcp-comms.h

@@ -1,13 +0,0 @@
-#include <netinet/in.h>
-
-#define GULM_MAX_CLUSTER_MESSAGE 1600
-#define GULM_MAX_CSID_LEN sizeof(struct in6_addr)
-#define GULM_MAX_CLUSTER_MEMBER_NAME_LEN 128
-
-extern int init_comms(unsigned short);
-extern char *print_csid(char *);
-int get_main_gulm_cluster_fd(void);
-int cluster_fd_gulm_callback(struct local_client *fd, char *buf, int len, char *csid, struct local_client **new_client);
-int gulm_cluster_send_message(void *buf, int msglen, char *csid, const char *errtext);
-void get_our_gulm_csid(char *csid);
-int gulm_connect_csid(char *csid, struct local_client **newclient);

daemons/dmeventd/.exported_symbols

@@ -1,5 +0,0 @@
-dm_event_register
-dm_event_unregister
-dm_event_get_registered_device
-dm_event_set_timeout
-dm_event_get_timeout

daemons/dmeventd/Makefile.in

@@ -1,73 +0,0 @@
-#
-# Copyright (C) 2005 Red Hat, Inc. All rights reserved.
-#
-# This file is part of the device-mapper userspace tools.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU Lesser General Public License v.2.1.
-#
-# You should have received a copy of the GNU Lesser 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
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-SOURCES = libdevmapper-event.c \
-	  dmeventd.c
-
-LIB_STATIC = libdevmapper-event.a
-
-ifeq ("@LIB_SUFFIX@","dylib")
-  LIB_SHARED = libdevmapper-event.dylib
-else
-  LIB_SHARED = libdevmapper-event.so
-endif
-
-include ../make.tmpl
-
-CLDFLAGS += -ldl -ldevmapper -lpthread
-
-.PHONY: install_dynamic install_static install_include \
-	install_pkgconfig
-
-INSTALL_TYPE = install_dynamic
-
-ifeq ("@STATIC_LINK@", "yes")
-  INSTALL_TYPE += install_static
-endif
-
-ifeq ("@PKGCONFIG@", "yes")
-  INSTALL_TYPE += install_pkgconfig
-endif
-
-install: $(INSTALL_TYPE) install_include
-
-install_include:
-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.h \
-		$(includedir)/libdevmapper-event.h
-
-install_dynamic: libdevmapper-event.$(LIB_SUFFIX)
-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-		$(libdir)/libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION)
-	$(LN_S) -f libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION) \
-		$(libdir)/libdevmapper-event.$(LIB_SUFFIX)
-
-install_pkgconfig:
-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.pc \
-		$(usrlibdir)/pkgconfig/devmapper-event.pc
-
-install_static: libdevmapper-event.a
-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-		$(libdir)/libdevmapper-event.a.$(LIB_VERSION)
-	$(LN_S) -f libdevmapper-event.a.$(LIB_VERSION) $(libdir)/libdevmapper-event.a
-
-.PHONY: distclean_lib distclean
-
-distclean_lib: 
-	$(RM) libdevmapper-event.pc
-
-distclean: distclean_lib
-

daemons/dmeventd/dmeventd.h

@@ -1,13 +0,0 @@
-#ifndef __DMEVENTD_DOT_H__
-#define __DMEVENTD_DOT_H__
-
-#define EXIT_LOCKFILE_INUSE      2
-#define EXIT_DESC_CLOSE_FAILURE  3
-#define EXIT_OPEN_PID_FAILURE    4
-#define EXIT_FIFO_FAILURE        5
-#define EXIT_CHDIR_FAILURE       6
-
-void dmeventd(void)
-    __attribute((noreturn));
-
-#endif /* __DMEVENTD_DOT_H__ */

daemons/dmeventd/libdevmapper-event.c

@@ -1,510 +0,0 @@
- /*
- * Copyright (C) 2005 Red Hat, Inc. All rights reserved.
- *
- * This file is part of the device-mapper userspace tools.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser 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
- */
-
-#include "lib.h"
-#include "libdevmapper-event.h"
-//#include "libmultilog.h"
-#include "dmeventd.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/file.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/wait.h>
-
-/* Set by any of the external fxns the first time one of them is called */
-/* FIXME Unused */
-// static int _logging = 0;
-
-/* Fetch a string off src and duplicate it into *dest. */
-/* FIXME: move to seperate module to share with the daemon. */
-static const char delimiter = ' ';
-static char *fetch_string(char **src)
-{
-	char *p, *ret;
-
-	if ((p = strchr(*src, delimiter)))
-		*p = 0;
-
-	if ((ret = dm_strdup(*src)))
-		*src += strlen(ret) + 1;
-
-	if (p)
-		*p = delimiter;
-
-	return ret;
-}
-
-/* Parse a device message from the daemon. */
-static int parse_message(struct dm_event_daemon_message *msg, char **dso_name,
-			 char **device, enum dm_event_type *events)
-{
-	char *p = msg->msg;
-
-	if ((*dso_name = fetch_string(&p)) &&
-	    (*device   = fetch_string(&p))) {
-		*events = atoi(p);
-
-		return 0;
-	}
-
-	return -ENOMEM;
-}
-
-/*
- * daemon_read
- * @fifos
- * @msg
- *
- * Read message from daemon.
- *
- * Returns: 0 on failure, 1 on success
- */
-static int daemon_read(struct dm_event_fifos *fifos, struct dm_event_daemon_message *msg)
-{
-	unsigned bytes = 0;
-	int ret = 0;
-	fd_set fds;
-
-	memset(msg, 0, sizeof(*msg));
-	while (bytes < sizeof(*msg)) {
-		do {
-			/* Watch daemon read FIFO for input. */
-			FD_ZERO(&fds);
-			FD_SET(fifos->server, &fds);
-			ret = select(fifos->server+1, &fds, NULL, NULL, NULL);
-			if (ret < 0 && errno != EINTR) {
-				/* FIXME Log error */
-				return 0;
-			}
-		} while (ret < 1);
-
-		ret = read(fifos->server, msg, sizeof(*msg) - bytes);
-		if (ret < 0) {
-			if ((errno == EINTR) || (errno == EAGAIN))
-				continue;
-			else {
-				/* FIXME Log error */
-				return 0;
-			}
-		}
-
-		bytes += ret;
-	}
-
-	return bytes == sizeof(*msg);
-}
-
-/* Write message to daemon. */
-static int daemon_write(struct dm_event_fifos *fifos, struct dm_event_daemon_message *msg)
-{
-	unsigned bytes = 0;
-	int ret = 0;
-	fd_set fds;
-
-	while (bytes < sizeof(*msg)) {
-		do {
-			/* Watch daemon write FIFO to be ready for output. */
-			FD_ZERO(&fds);
-			FD_SET(fifos->client, &fds);
-			ret = select(fifos->client +1, NULL, &fds, NULL, NULL);
-			if ((ret < 0) && (errno != EINTR)) {
-				/* FIXME Log error */
-				return 0;
-			}
-		} while (ret < 1);
-
-		ret = write(fifos->client, msg, sizeof(*msg) - bytes);
-		if (ret < 0) {
-			if ((errno == EINTR) || (errno == EAGAIN))
-				continue;
-			else {
-				/* fixme: log error */
-				return 0;
-			}
-		}
-
-		bytes += ret;
-	}
-
-	return bytes == sizeof(*msg);
-}
-
-static int daemon_talk(struct dm_event_fifos *fifos, struct dm_event_daemon_message *msg,
-		       int cmd, char *dso_name, char *device,
-		       enum dm_event_type events, uint32_t timeout)
-{
-	memset(msg, 0, sizeof(*msg));
-
-	/*
-	 * Set command and pack the arguments
-	 * into ASCII message string.
-	 */
-	msg->opcode.cmd = cmd;
-
-	if (sizeof(msg->msg) <= (unsigned) snprintf(msg->msg, sizeof(msg->msg),
-						    "%s %s %u %"PRIu32,
-						    dso_name ? dso_name : "",
-						    device ? device : "",
-						    events, timeout)) {
-		stack;
-		return -ENAMETOOLONG;
-	}
-
-	/*
-	 * Write command and message to and
-	 * read status return code from daemon.
-	 */
-	if (!daemon_write(fifos, msg)) {
-		stack;
-		return -EIO;
-	}
-
-	if (!daemon_read(fifos, msg)) {
-		stack;
-		return -EIO;
-	}
-
-	return msg->opcode.status;
-}
-
-static volatile sig_atomic_t daemon_running = 0;
-
-static void daemon_running_signal_handler(int sig)
-{
-	daemon_running = 1;
-}
-
-/*
- * start_daemon
- *
- * This function forks off a process (dmeventd) that will handle
- * the events.  A signal must be returned from the child to
- * indicate when it is ready to handle requests.  The parent
- * (this function) returns 1 if there is a daemon running. 
- *
- * Returns: 1 on success, 0 otherwise
- */
-static int start_daemon(void)
-{
-	int pid, ret=0;
-	void *old_hand;
-	sigset_t set, oset;
-
-	/* Must be able to acquire signal */
-	old_hand = signal(SIGUSR1, &daemon_running_signal_handler);
-	if (old_hand == SIG_ERR) {
-		log_error("Unable to setup signal handler.");
-		return 0;
-	}
-
-	if (sigemptyset(&set) || sigaddset(&set, SIGUSR1)) {
-		log_error("Unable to fill signal set.");
-	} else if (sigprocmask(SIG_UNBLOCK, &set, &oset)) {
-		log_error("Can't unblock the potentially blocked signal SIGUSR1");
-	}
-	
-	pid = fork();
-
-	if (pid < 0)
-		log_error("Unable to fork.\n");
-	else if (pid) { /* parent waits for child to get ready for requests */
-		int status;
-
-		/* FIXME Better way to do this? */
-		while (!waitpid(pid, &status, WNOHANG) && !daemon_running)
-			sleep(1);
-
-		if (daemon_running) {
-			ret = 1;
-		} else {
-			switch (WEXITSTATUS(status)) {
-			case EXIT_LOCKFILE_INUSE:
-				/*
-				 * Note, this is ok... we still have daemon
-				 * that we can communicate with...
-				 */
-				log_print("Starting dmeventd failed: "
-					  "dmeventd already running.\n");
-				ret = 1;
-				break;
-			default:
-				log_error("Unable to start dmeventd.\n");
-				break;
-			}
-		}
-		/*
-		 * Sometimes, a single process may perform multiple calls
-		 * that result in a daemon starting and exiting.  If we
-		 * don't reset this, the second (or greater) time the daemon
-		 * is started will cause this logic not to work.
-		 */
-		daemon_running = 0;
-	} else {
-		signal(SIGUSR1, SIG_IGN); /* don't care about error */
-
-		/* dmeventd function is responsible for properly setting **
-		** itself up.  It must never return - only exit.  This is**
-		** why it is followed by an EXIT_FAILURE                 */
-		dmeventd();
-		exit(EXIT_FAILURE);
-	}
-
-	/* FIXME What if old_hand is SIG_ERR? */
-	if (signal(SIGUSR1, old_hand) == SIG_ERR)
-		log_error("Unable to reset signal handler.");
-
-	if (sigprocmask(SIG_SETMASK, &oset, NULL))
-		log_error("Unable to reset signal mask.");
-
-	return ret;
-}
-
-/* Initialize client. */
-static int init_client(struct dm_event_fifos *fifos)
-{
-	/* FIXME Is fifo the most suitable method? */
-	/* FIXME Why not share comms/daemon code with something else e.g. multipath? */
-
-	/* init fifos */
-	memset(fifos, 0, sizeof(*fifos));
-	fifos->client_path = DM_EVENT_FIFO_CLIENT;
-	fifos->server_path = DM_EVENT_FIFO_SERVER;
-
-	/* FIXME The server should be responsible for these, not the client. */
-	/* Create fifos */
-	if (((mkfifo(fifos->client_path, 0600) == -1) && errno != EEXIST) ||
-	    ((mkfifo(fifos->server_path, 0600) == -1) && errno != EEXIST)) {
-		log_error("%s: Failed to create a fifo.\n", __func__);
-		return 0;
-	}
-
-	/* FIXME Warn/abort if perms are wrong - not something to fix silently. */
-	/* If they were already there, make sure permissions are ok. */
-	if (chmod(fifos->client_path, 0600)) {
-		log_error("Unable to set correct file permissions on %s",
-			fifos->client_path);
-		return 0;
-	}
-
-	if (chmod(fifos->server_path, 0600)) {
-		log_error("Unable to set correct file permissions on %s",
-			fifos->server_path);
-		return 0;
-	}
-
-	/*
-	 * Open the fifo used to read from the daemon.
-	 * Allows daemon to create its write fifo...
-	 */
-	if ((fifos->server = open(fifos->server_path, O_RDWR)) < 0) {
-		log_error("%s: open server fifo %s\n",
-			__func__, fifos->server_path);
-		stack;
-		return 0;
-	}
-
-	/* Lock out anyone else trying to do communication with the daemon. */
-	/* FIXME Why failure not retry?  How do multiple processes communicate? */
-	if (flock(fifos->server, LOCK_EX) < 0){
-		log_error("%s: flock %s\n", __func__, fifos->server_path);
-		close(fifos->server);
-		return 0;
-	}
-
-	/* Anyone listening?  If not, errno will be ENXIO */
-	while ((fifos->client = open(fifos->client_path,
-				  O_WRONLY | O_NONBLOCK)) < 0) {
-		if (errno != ENXIO) {
-			log_error("%s: Can't open client fifo %s: %s\n",
-				  __func__, fifos->client_path, strerror(errno));
-			close(fifos->server);
-			stack;
-			return 0;
-		}
-		
-		/* FIXME Unnecessary if daemon was started before calling this */
-		if (!start_daemon()) {
-			stack;
-			return 0;
-		}
-	}
-	
-	return 1;
-}
-
-static void dtr_client(struct dm_event_fifos *fifos)
-{
-	if (flock(fifos->server, LOCK_UN))
-		log_error("flock unlock %s\n", fifos->server_path);
-
-	close(fifos->client);
-	close(fifos->server);
-}
-
-/* Check, if a block device exists. */
-static int device_exists(char *device)
-{
-	struct stat st_buf;
-	char path2[PATH_MAX];
-
-	if (!device)
-		return 0;
-
-	if (device[0] == '/') /* absolute path */
-		return !stat(device, &st_buf) && S_ISBLK(st_buf.st_mode);
-
-	if (PATH_MAX <= snprintf(path2, PATH_MAX, "%s/%s", dm_dir(), device))
-		return 0;
-
-	return !stat(path2, &st_buf) && S_ISBLK(st_buf.st_mode);
-}
-
-/* Handle the event (de)registration call and return negative error codes. */
-static int do_event(int cmd, struct dm_event_daemon_message *msg,
-		    char *dso_name, char *device, enum dm_event_type events,
-		    uint32_t timeout)
-{
-	int ret;
-	struct dm_event_fifos fifos;
-
-	/* FIXME Start the daemon here if it's not running e.g. exclusive lock file */
-	/* FIXME Move this to separate 'dm_event_register_handler' - if no daemon here, fail */
-	if (!init_client(&fifos)) {
-		stack;
-		return -ESRCH;
-	}
-
-	/* FIXME Use separate 'dm_event_register_handler' function to pass in dso? */
-	ret = daemon_talk(&fifos, msg, cmd, dso_name, device, events, timeout);
-
-	/* what is the opposite of init? */
-	dtr_client(&fifos);
-	
-	return ret;
-}
-
-/* FIXME remove dso_name - use handle instead */
-/* FIXME Use uuid not path! */
-/* External library interface. */
-int dm_event_register(char *dso_name, char *device_path,
-		      enum dm_event_type events)
-{
-	int ret;
-	struct dm_event_daemon_message msg;
-
-	if (!device_exists(device_path)) {
-		log_error("%s: device not found", device_path);
-		return 0;
-	}
-
-	if ((ret = do_event(DM_EVENT_CMD_REGISTER_FOR_EVENT, &msg,
-			    dso_name, device_path, events, 0)) < 0) {
-		log_error("%s: event registration failed: %s", device_path,
-			  strerror(-ret));
-		return 0;
-	}
-
-	return 1;
-}
-
-int dm_event_unregister(char *dso_name, char *device_path,
-			enum dm_event_type events)
-{
-	int ret;
-	struct dm_event_daemon_message msg;
-
-	if (!device_exists(device_path)) {
-		log_error("%s: device not found", device_path);
-		return 0;
-	}
-
-	if ((ret = do_event(DM_EVENT_CMD_UNREGISTER_FOR_EVENT, &msg,
-			    dso_name, device_path, events, 0)) < 0) {
-		log_error("%s: event deregistration failed: %s", device_path,
-			  strerror(-ret));
-		return 0;
-	}
-
-	return 1;
-}
-
-int dm_event_get_registered_device(char **dso_name, char **device_path,
-			     enum dm_event_type *events, int next)
-{
-	int ret;
-	char *dso_name_arg = NULL, *device_path_arg = NULL;
-	struct dm_event_daemon_message msg;
-
-	if (!(ret = do_event(next ? DM_EVENT_CMD_GET_NEXT_REGISTERED_DEVICE :
-				    DM_EVENT_CMD_GET_REGISTERED_DEVICE,
-			     &msg, *dso_name, *device_path, *events, 0)))
-		ret = parse_message(&msg, &dso_name_arg, &device_path_arg,
-				    events);
-
-	if (next){
-		if (*dso_name)
-			dm_free(*dso_name);
-		if (*device_path)
-			dm_free(*device_path);
-		*dso_name = dso_name_arg;
-		*device_path = device_path_arg;
-	} else {
-		if (!(*dso_name))
-			*dso_name = dso_name_arg;
-		if (!(*device_path))
-			*device_path = device_path_arg;
-	}
-
-	return ret;
-}
-
-int dm_event_set_timeout(char *device_path, uint32_t timeout)
-{
-	struct dm_event_daemon_message msg;
-
-	if (!device_exists(device_path))
-		return -ENODEV;
-	return do_event(DM_EVENT_CMD_SET_TIMEOUT, &msg,
-			NULL, device_path, 0, timeout);
-}
-
-int dm_event_get_timeout(char *device_path, uint32_t *timeout)
-{
-	int ret;
-	struct dm_event_daemon_message msg;
-
-	if (!device_exists(device_path))
-		return -ENODEV;
-	if (!(ret = do_event(DM_EVENT_CMD_GET_TIMEOUT, &msg, NULL, device_path, 0, 0)))
-		*timeout = atoi(msg.msg);
-	return ret;
-}
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */

daemons/dmeventd/libdevmapper-event.h

@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2005 Red Hat, Inc. All rights reserved.
- *
- * This file is part of the device-mapper userspace tools.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser 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
- */
-
-/*
- * Note that this file is released only as part of a technology preview
- * and its contents may change in future updates in ways that do not
- * preserve compatibility.
- */
-
-#ifndef LIB_DMEVENT_H
-#define LIB_DMEVENT_H
-
-#include <stdint.h>
-
-/* FIXME This stuff must be configurable. */
-
-#define	DM_EVENT_DAEMON		"/sbin/dmeventd"
-#define DM_EVENT_LOCKFILE	"/var/lock/dmeventd"
-#define	DM_EVENT_FIFO_CLIENT	"/var/run/dmeventd-client"
-#define	DM_EVENT_FIFO_SERVER	"/var/run/dmeventd-server"
-#define DM_EVENT_PIDFILE	"/var/run/dmeventd.pid"
-
-#define DM_EVENT_DEFAULT_TIMEOUT 10
-
-/* Commands for the daemon passed in the message below. */
-enum dm_event_command {
-	DM_EVENT_CMD_ACTIVE = 1,
-	DM_EVENT_CMD_REGISTER_FOR_EVENT,
-	DM_EVENT_CMD_UNREGISTER_FOR_EVENT,
-	DM_EVENT_CMD_GET_REGISTERED_DEVICE,
-	DM_EVENT_CMD_GET_NEXT_REGISTERED_DEVICE,
-	DM_EVENT_CMD_SET_TIMEOUT,
-	DM_EVENT_CMD_GET_TIMEOUT,
-};
-
-/* Message passed between client and daemon. */
-struct dm_event_daemon_message {
-	union {
-		unsigned int cmd;	/* FIXME Use fixed size. */
-		int	 status;	/* FIXME Use fixed size. */
-	} opcode;
-	char msg[252];		/* FIXME Why is this 252 ? */
-} __attribute__((packed));	/* FIXME Do this properly! */
-
-/* FIXME Is this meant to be exported?  I can't see where the interface uses it. */
-/* Fifos for client/daemon communication. */
-struct dm_event_fifos {
-	int client;
-	int server;
-	const char *client_path;
-	const char *server_path;
-};
-
-/* Event type definitions. */
-/* FIXME Use masks to separate the types and provide for extension. */
-enum dm_event_type {
-	DM_EVENT_SINGLE		= 0x01, /* Report multiple errors just once. */
-	DM_EVENT_MULTI		= 0x02, /* Report all of them. */
-
-	DM_EVENT_SECTOR_ERROR	= 0x04, /* Failure on a particular sector. */
-	DM_EVENT_DEVICE_ERROR	= 0x08, /* Device failure. */
-	DM_EVENT_PATH_ERROR	= 0x10, /* Failure on an io path. */
-	DM_EVENT_ADAPTOR_ERROR	= 0x20, /* Failure off a host adaptor. */
-
-	DM_EVENT_SYNC_STATUS	= 0x40, /* Mirror synchronization completed/failed. */
-	DM_EVENT_TIMEOUT	= 0x80, /* Timeout has occured */
-};
-
-/* FIXME Use a mask. */
-#define	DM_EVENT_ALL_ERRORS (DM_EVENT_SECTOR_ERROR | DM_EVENT_DEVICE_ERROR | \
-			     DM_EVENT_PATH_ERROR | DM_EVENT_ADAPTOR_ERROR)
-
-/* Prototypes for event lib interface. */
-
-/* FIXME Replace device with standard name/uuid/devno choice */
-/* Interface changes: 
-   First register a handler, passing in a unique ref for the device. */
-//  int dm_event_register_handler(const char *dso_name, const char *device);
-//  int dm_event_register(const char *dso_name, const char *name, const char *uuid, uint32_t major, uint32_t minor, enum dm_event_type events);
-/* Or (better?) add to task structure and use existing functions - run a task to register/unregister events - we may need to run task withe that with the new event mechanism anyway, then the dso calls just hook in.
-*/
- 
-/* FIXME Missing consts? */
-int dm_event_register(char *dso_name, char *device, enum dm_event_type events);
-int dm_event_unregister(char *dso_name, char *device,
-			enum dm_event_type events);
-int dm_event_get_registered_device(char **dso_name, char **device,
-				   enum dm_event_type *events, int next);
-int dm_event_set_timeout(char *device, uint32_t timeout);
-int dm_event_get_timeout(char *device, uint32_t *timeout);
-
-/* Prototypes for DSO interface. */
-void process_event(const char *device, enum dm_event_type event);
-int register_device(const char *device);
-int unregister_device(const char *device);
-
-#endif

daemons/dmeventd/libdevmapper-event.pc.in

@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: devmapper-event
-Description: device-mapper event library
-Version: @DM_LIB_VERSION@
-Requires: devmapper
-Cflags: -I${includedir}
-Libs: -L${libdir} -ldevmapper-event
-Libs.private: -lpthread -ldl

daemons/dmeventd/plugins/Makefile.in

@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
-#
-# This file is part of the LVM2.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU General Public License v.2.
-#
-# 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
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-SUBDIRS += mirror
-
-include $(top_srcdir)/make.tmpl
-

daemons/dmeventd/plugins/mirror/.exported_symbols

@@ -1,3 +0,0 @@
-process_event
-register_device
-unregister_device

daemons/dmeventd/plugins/mirror/Makefile.in

@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
-#
-# This file is part of the LVM2.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU General Public License v.2.
-#
-# 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
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-INCLUDES += -I${top_srcdir}/tools
-CLDFLAGS += -L${top_srcdir}/tools -ldevmapper -llvm2cmd
-
-SOURCES = dmeventd_mirror.c
-
-ifeq ("@LIB_SUFFIX@","dylib")
-  LIB_SHARED = libdevmapper-event-lvm2mirror.dylib
-else
-  LIB_SHARED = libdevmapper-event-lvm2mirror.so
-endif
-
-include $(top_srcdir)/make.tmpl
-
-install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-		$(libdir)/$<.$(LIB_VERSION)
-	$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
-

daemons/dmeventd/plugins/mirror/dmeventd_mirror.c

@@ -1,254 +0,0 @@
-/*
- * Copyright (C) 2005 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser 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
- */
-
-#include "libdevmapper.h"
-#include "libdevmapper-event.h"
-#include "lvm2cmd.h"
-#include "lvm-string.h"
-
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <unistd.h>
-
-#include <syslog.h> /* FIXME Replace syslog with multilog */
-
-#define ME_IGNORE    0
-#define ME_INSYNC    1
-#define ME_FAILURE   2
-
-static pthread_mutex_t _lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* FIXME: We may need to lock around operations to these */
-static int register_count = 0;
-static struct dm_pool *mem_pool = NULL;
-
-static int _get_mirror_event(char *params)
-{
-	int i, rtn = ME_INSYNC;
-	int max_args = 30;  /* should support at least 8-way mirrors */
-	char *args[max_args];
-	char *dev_status_str;
-	char *log_status_str;
-	char *sync_str;
-	char *p;
-	int log_argc, num_devs, num_failures=0;
-
-	if (max_args <= split_words(params, max_args, args)) {
-		syslog(LOG_ERR, "Unable to split mirror parameters: Arg list too long");
-		return -E2BIG;
-	}
-
-	/*
-	 * Unused:  0 409600 mirror
-	 * Used  :  2 253:4 253:5 400/400 1 AA 3 cluster 253:3 A
-	*/
-	num_devs = atoi(args[0]);
-	dev_status_str = args[3 + num_devs];
-	log_argc = atoi(args[4 + num_devs]);
-	log_status_str = args[4 + num_devs + log_argc];
-	sync_str = args[1 + num_devs];
-
-	/* Check for bad mirror devices */
-	for (i = 0; i < num_devs; i++) {
-		if (dev_status_str[i] == 'D') {
-			syslog(LOG_ERR, "Mirror device, %s, has failed.\n", args[i+1]);
-			num_failures++;
-		}
-	}
-
-	/* Check for bad log device */
-	if (log_status_str[0] == 'D') {
-		syslog(LOG_ERR, "Log device, %s, has failed.\n",
-		       args[3 + num_devs + log_argc]);
-		num_failures++;
-	}
-
-	if (num_failures) {
-		rtn = ME_FAILURE;
-		goto out;
-	}
-
-	p = strstr(sync_str, "/");
-	if (p) {
-		p[0] = '\0';
-		if (strcmp(sync_str, p+1))
-			rtn = ME_IGNORE;
-		p[0] = '/';
-	} else {
-		/*
-		 * How the hell did we get this?
-		 * Might mean all our parameters are screwed.
-		 */
-		syslog(LOG_ERR, "Unable to parse sync string.");
-		rtn = ME_IGNORE;
-	}
- out:
-	return rtn;
-}
-
-static void _temporary_log_fn(int level, const char *file,
-			      int line, const char *format)
-{
-	if (!strncmp(format, "WARNING: ", 9) && (level < 5))
-		syslog(LOG_CRIT, "%s", format);
-	else
-		syslog(LOG_DEBUG, "%s", format);
-}
-
-static int _remove_failed_devices(const char *device)
-{
-	int r;
-	void *handle;
-	int cmd_size = 256;	/* FIXME Use system restriction */
-	char cmd_str[cmd_size];
-	char *vg = NULL, *lv = NULL, *layer = NULL;
-
-	if (strlen(device) > 200)
-		return -ENAMETOOLONG;
-
-	if (!split_dm_name(mem_pool, device, &vg, &lv, &layer)) {
-		syslog(LOG_ERR, "Unable to determine VG name from %s",
-		       device);
-		return -ENOMEM;
-	}
-
-	/* FIXME Is any sanity-checking required on %s? */
-	if (cmd_size <= snprintf(cmd_str, cmd_size, "vgreduce --removemissing %s", vg)) {
-		/* this error should be caught above, but doesn't hurt to check again */
-		syslog(LOG_ERR, "Unable to form LVM command: Device name too long");
-		dm_pool_empty(mem_pool);  /* FIXME: not safe with multiple threads */
-		return -ENAMETOOLONG;
-	}
-
-	lvm2_log_fn(_temporary_log_fn);
-	handle = lvm2_init();
-	lvm2_log_level(handle, 1);
-	r = lvm2_run(handle, cmd_str);
-
-	dm_pool_empty(mem_pool);  /* FIXME: not safe with multiple threads */
-	return (r == 1)? 0: -1;
-}
-
-void process_event(const char *device, enum dm_event_type event)
-{
-	struct dm_task *dmt;
-	void *next = NULL;
-	uint64_t start, length;
-	char *target_type = NULL;
-	char *params;
-
-	if (pthread_mutex_trylock(&_lock)) {
-		syslog(LOG_NOTICE, "Another thread is handling an event.  Waiting...");
-		pthread_mutex_lock(&_lock);
-	}
-	/* FIXME Move inside libdevmapper */
-	if (!(dmt = dm_task_create(DM_DEVICE_STATUS))) {
-		syslog(LOG_ERR, "Unable to create dm_task.\n");
-		goto fail;
-	}
-
-	if (!dm_task_set_name(dmt, device)) {
-		syslog(LOG_ERR, "Unable to set device name.\n");
-		goto fail;
-	}
-
-	if (!dm_task_run(dmt)) {
-		syslog(LOG_ERR, "Unable to run task.\n");
-		goto fail;
-	}
-
-	do {
-		next = dm_get_next_target(dmt, next, &start, &length,
-					  &target_type, &params);
-
-		if (strcmp(target_type, "mirror")) {
-			syslog(LOG_INFO, "%s has unmirrored portion.\n", device);
-			continue;
-		}
-
-		switch(_get_mirror_event(params)) {
-		case ME_INSYNC:
-			/* FIXME: all we really know is that this
-			   _part_ of the device is in sync
-			   Also, this is not an error
-			*/
-			syslog(LOG_NOTICE, "%s is now in-sync\n", device);
-			break;
-		case ME_FAILURE:
-			syslog(LOG_ERR, "Device failure in %s\n", device);
-			if (_remove_failed_devices(device))
-				syslog(LOG_ERR, "Failed to remove faulty devices in %s\n",
-				       device);
-			/* Should check before warning user that device is now linear
-			else
-				syslog(LOG_NOTICE, "%s is now a linear device.\n",
-					device);
-			*/
-			break;
-		case ME_IGNORE:
-			break;
-		default:
-			syslog(LOG_INFO, "Unknown event received.\n");
-		}
-	} while (next);
-
- fail:
-	if (dmt)
-		dm_task_destroy(dmt);
-	pthread_mutex_unlock(&_lock);
-}
-
-int register_device(const char *device)
-{
-	syslog(LOG_INFO, "Monitoring mirror device, %s for events\n", device);
-
-	/*
-	 * Need some space for allocations.  1024 should be more
-	 * than enough for what we need (device mapper name splitting)
-	 */
-	if (!mem_pool)
-		mem_pool = dm_pool_create("mirror_dso", 1024);
-
-	if (!mem_pool)
-		return 0;
-
-	register_count++;
-
-        return 1;
-}
-
-int unregister_device(const char *device)
-{
-	if (!(--register_count)) {
-		dm_pool_destroy(mem_pool);
-		mem_pool = NULL;
-	}
-
-        return 1;
-}
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */

debian/README.Debian

@@ -1,6 +0,0 @@
-LVM2 requires the device-mapper kernel module (dm-mod).  This is
-available as a kernel patch for 2.4 (in kernel-patch-device-mapper), and
-is distributed with linux 2.5 and above.  The LVM1 kernel module (lvm-mod)
-will not work with lvm2 packages.  dm-mod and lvm-mod may both be loaded
-in the kernel at the same time with no problems.  Without dm-mod, this
-package is pretty useless.

debian/changelog

@@ -1,82 +0,0 @@
-lvm2 (1.95.15-1) unstable; urgency=low
-  
-  * New upstream release.
-  * Remove undocumented manpage symlinks.
-  * Update description to be more informative.  (Closes: #173499)
-  * Add kernel-patch-device-mapper suggestion.
-  * Update standards version.
-
- -- Andres Salomon <dilinger@mp3revolution.net>  Sun, 16 Feb 2002 04:21:26 -0400
-
-lvm2 (1.95.11-1) unstable; urgency=low
-
-  * New upstream release.  (Closes: #171436)
-  * Removed TODO and INTRO from debian/docs; added WHATS_NEW.
-  * Remove vgcfgrestore.8 undocumented symlink.
-  * Added a README.Debian, mentioning the device-mapper kernel module
-    requirement that lvm2 has.  (Closes: #171674, #163020)
-  * Get rid of debian/conffiles (debhelper's smart enough to figure that out).
-  * debian/copyright fix to appease lintian.
-  * Fix typo in tools/commands.h that caused /usr/sbin/; to be created.
-
- -- Andres Salomon <dilinger@mp3revolution.net>  Mon,  9 Dec 2002 02:51:02 -0400
-
-lvm2 (1.95.10-2) unstable; urgency=low
-
-  * Fix software raid problems by ensuring lvm init script runs after
-    raidtools init script.  (Closes: #152569)
-
- -- Andres Salomon <dilinger@mp3revolution.net>  Tue,  3 Sep 2002 04:05:43 -0400
-
-lvm2 (1.95.10-1) unstable; urgency=low
-
-  * New upstream release (Beta 3.2).
-  * Change all references to /dev/device-mapper/control to
-    /dev/mapper/control.
-
- -- Andres Salomon <dilinger@mp3revolution.net>  Sun,  1 Sep 2002 18:55:12 -0400
-
-lvm2 (0.95.05-3) unstable; urgency=low
-
-  * Get rid of awk dependency in init script.  (Closes: #146257)
-
- -- Andres Salomon <dilinger@mp3revolution.net>  Sun, 12 May 2002 04:39:06 -0500
-
-lvm2 (0.95.05-2) unstable; urgency=low
-
-  * Use ${shlibs:Depends} in Depends.
-  * Get rid of postinst/postrm scripts, use debhelper's init script instead.
-  * Add Conflicts against lvm10, lvm-common.
-  * Fix endian issues on big-endian machines.
-
- -- Andres Salomon <dilinger@mp3revolution.net>  Thu,  2 May 2002 23:53:53 -0500
-
-lvm2 (0.95.05-1) unstable; urgency=low
-
-  * New release (Beta2).
-
- -- Andres Salomon <dilinger@mp3revolution.net>  Thu, 25 Apr 2002 00:37:41 -0500
-
-lvm2 (0.95.04cvs20020306-1) unstable; urgency=low
-
-  * CVS updated.
-  * Convert from debian native package.
-
- -- Andres Salomon <dilinger@mp3revolution.net>  Wed,  6 Mar 2002 00:43:21 -0500
-
-lvm2 (0.95.04cvs20020304) unstable; urgency=low
-
-  * CVS updated.
-  * Enhance init script; create devmapper control device, etc.
-  * Add dmsetup as a suggestion.
-  * Add /etc/lvm/lvm.conf conffile.
-  * Add undocumented(7) for the commands missing manpages.
-  
- -- Andres Salomon <dilinger@mp3revolution.net>  Mon,  4 Mar 2002 04:51:26 -0500
-
-lvm2 (0.95.02cvs20020220) unstable; urgency=low
-
-  * Initial Release.
-
- -- Andres Salomon <dilinger@mp3revolution.net>  Wed, 20 Feb 2002 03:17:25 -0500
-

debian/control

@@ -1,24 +0,0 @@
-Source: lvm2
-Section: admin
-Priority: optional
-Maintainer: Andres Salomon <dilinger@mp3revolution.net>
-Build-Depends: debhelper (>> 3.0.0), libdevmapper-dev (>= 0.96.04), libreadline4-dev
-Standards-Version: 3.5.8.0
-
-Package: lvm2
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: lvm10, lvm-common
-Replaces: lvm10, lvm-common
-Provides: lvm-binaries
-Suggests: dmsetup, kernel-patch-device-mapper
-Description: The Linux Logical Volume Manager
- This is LVM2, the rewrite of The Linux Logical Volume Manager.  LVM
- supports enterprise level volume management of disk and disk subsystems
- by grouping arbitrary disks into volume groups. The total capacity of
- volume groups can be allocated to logical volumes, which are accessed as
- regular block devices.
- .
- LVM2 is currently stable, but has some unimplemented features (most notably,
- pvmove and e2fsadm).  It is not yet recommended for production use.  It is
- backwards-compatible with LVM1 (lvm10), and requires Linux kernel 2.4.

debian/copyright

@@ -1,25 +0,0 @@
-This package was debianized by Andres Salomon <dilinger@mp3revolution.net> on
-Wed, 20 Feb 2002 03:17:25 -0500.
-
-It was downloaded from http://www.sistina.com/products_lvm.htm
-
-Upstream Author: LVM Development Team
-
-Copyright (c) 2001-2002 LVM Development Team
-
-LVM2 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.
-
-LVM2 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
-
-On Debian systems, the full text of the GPL can be found in
-/usr/share/common-licenses/GPL

debian/dirs

@@ -1,4 +0,0 @@
-etc/lvm
-usr/share/man/man5
-usr/share/man/man8
-sbin

debian/docs

@@ -1,5 +0,0 @@
-BUGS
-README
-VERSION
-WHATS_NEW
-doc/*

debian/init.d

@@ -1,64 +0,0 @@
-#! /bin/sh
-#
-# lvm2		This script handles LVM2 initialization/shutdown.
-#
-#		Written by Andres Salomon <dilinger@mp3revolution.net>.
-#
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-NAME=lvm2
-DESC=LVM
-
-test -x /sbin/vgchange || exit 0
-modprobe dm-mod >/dev/null 2>&1
-
-# Create necessary files in /dev for device-mapper
-create_devfiles() {
-	DIR="/dev/mapper"
-	FILE="$DIR/control"
-	major=$(grep "[0-9] misc$" /proc/devices | sed 's/[ ]\+misc//')
-	minor=$(grep "[0-9] device-mapper$" /proc/misc | sed 's/[ ]\+device-mapper//')
-
-	if test ! -d $DIR; then
-		mkdir --mode=755 $DIR >/dev/null 2>&1
-	fi
-
-	if test ! -c $FILE -a ! -z "$minor"; then
-		mknod --mode=600 $FILE c $major $minor >/dev/null 2>&1
-	fi
-}
-
-case "$1" in
-  start)
-	echo -n "Initializing $DESC: "
-	create_devfiles
-	vgchange -a y
-
-#	# Mount all LVM devices
-#	for vg in $( vgchange -a y 2>/dev/null | grep active | awk -F\" '{print $2}' ); do
-#		MTPT=$( grep $vg /etc/fstab | awk '{print $2}' )
-#		mount $MTPT
-#	done
-	echo "$NAME."
-	;;
-  stop)
-	echo -n "Shutting down $DESC: "
-	# We don't really try all that hard to shut it down; far too many
-	# things that can keep it from successfully shutting down.
-	vgchange -a n
-	echo "$NAME."
-	;;
-  restart|force-reload)
-	echo -n "Restarting $DESC: "
-	vgchange -a n
-	sleep 1
-	vgchange -a y
-	echo "$NAME."
-	;;
-  *)
-	echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0

debian/manpages

@@ -1,26 +0,0 @@
-debian/lvm2/usr/share/man/man5/lvm.conf.5
-debian/lvm2/usr/share/man/man8/lvchange.8
-debian/lvm2/usr/share/man/man8/lvcreate.8
-debian/lvm2/usr/share/man/man8/lvdisplay.8
-debian/lvm2/usr/share/man/man8/lvextend.8
-debian/lvm2/usr/share/man/man8/lvm.8
-debian/lvm2/usr/share/man/man8/lvmchange.8
-debian/lvm2/usr/share/man/man8/lvreduce.8
-debian/lvm2/usr/share/man/man8/lvremove.8
-debian/lvm2/usr/share/man/man8/lvrename.8
-debian/lvm2/usr/share/man/man8/lvscan.8
-debian/lvm2/usr/share/man/man8/pvchange.8
-debian/lvm2/usr/share/man/man8/pvcreate.8
-debian/lvm2/usr/share/man/man8/pvdisplay.8
-debian/lvm2/usr/share/man/man8/pvscan.8
-debian/lvm2/usr/share/man/man8/vgcfgbackup.8
-debian/lvm2/usr/share/man/man8/vgchange.8
-debian/lvm2/usr/share/man/man8/vgck.8
-debian/lvm2/usr/share/man/man8/vgcreate.8
-debian/lvm2/usr/share/man/man8/vgdisplay.8
-debian/lvm2/usr/share/man/man8/vgextend.8
-debian/lvm2/usr/share/man/man8/vgmerge.8
-debian/lvm2/usr/share/man/man8/vgreduce.8
-debian/lvm2/usr/share/man/man8/vgremove.8
-debian/lvm2/usr/share/man/man8/vgrename.8
-debian/lvm2/usr/share/man/man8/vgscan.8

debian/rules

@@ -1,119 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. 
-# GNU copyright 1997 by Joey Hess.
-#
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
-
-# Uncomment this to turn on verbose mode. 
-#export DH_VERBOSE=1
-
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/ --mandir=\$${prefix}/usr/share/man --infodir=\$${prefix}/usr/share/info
-
-	touch configure-stamp
-
-build-arch: configure-stamp build-arch-stamp
-build-arch-stamp:
-	dh_testdir
-
-	# Add here command to compile/build the package.
-	$(MAKE)
-
-	touch build-arch-stamp
-
-build-indep: configure-stamp build-indep-stamp
-build-indep-stamp:
-	dh_testdir
-
-	# Add here command to compile/build the arch indep package.
-	# It's ok not to do anything here, if you don't need to build
-	#  anything for this package.
-	#/usr/bin/docbook-to-man debian/lvm2.sgml > lvm2.1
-
-	touch build-indep-stamp
-
-build: build-arch build-indep
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-	-test -r /usr/share/misc/config.sub && \
-	  cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-	  cp -f /usr/share/misc/config.guess config.guess
-
-
-	dh_clean
-
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/lvm2.
-	$(MAKE) install prefix=$(CURDIR)/debian/lvm2
-	install -m 0644 doc/example.conf debian/lvm2/etc/lvm/lvm.conf
-
-
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep: build install
-# nada.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-
-#	dh_installdebconf
-	dh_installdocs
-	dh_installexamples
-#	dh_installlogrotate -a
-#	dh_installemacsen -a
-#	dh_installpam -a
-#	dh_installmime -a
-	dh_installinit --update-rcd-params="start 26 S . start 50 0 6 ."
-	dh_installcron
-	dh_installman
-	dh_installinfo 
-	dh_installchangelogs
-	dh_strip
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-#	dh_perl -a
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

dmeventd/Makefile.in

@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
-#
-# This file is part of the LVM2.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU General Public License v.2.
-#
-# 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
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-SUBDIRS += mirror
-
-include $(top_srcdir)/make.tmpl
-

dmeventd/mirror/.exported_symbols

@@ -1,3 +0,0 @@
-process_event
-register_device
-unregister_device

dmeventd/mirror/Makefile.in

@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
-#
-# This file is part of the LVM2.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU General Public License v.2.
-#
-# 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
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-INCLUDES += -I${top_srcdir}/tools
-CLDFLAGS += -L${top_srcdir}/tools -ldevmapper -llvm2cmd
-
-SOURCES = dmeventd_mirror.c
-
-ifeq ("@LIB_SUFFIX@","dylib")
-  LIB_SHARED = libdevmapper-event-lvm2mirror.dylib
-else
-  LIB_SHARED = libdevmapper-event-lvm2mirror.so
-endif
-
-include $(top_srcdir)/make.tmpl
-
-install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-		$(libdir)/$<.$(LIB_VERSION)
-	$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
-

dmeventd/mirror/dmeventd_mirror.c

@@ -1,254 +0,0 @@
-/*
- * Copyright (C) 2005 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser 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
- */
-
-#include "libdevmapper.h"
-#include "libdevmapper-event.h"
-#include "lvm2cmd.h"
-#include "lvm-string.h"
-
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <unistd.h>
-
-#include <syslog.h> /* FIXME Replace syslog with multilog */
-
-#define ME_IGNORE    0
-#define ME_INSYNC    1
-#define ME_FAILURE   2
-
-static pthread_mutex_t _lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* FIXME: We may need to lock around operations to these */
-static int register_count = 0;
-static struct dm_pool *mem_pool = NULL;
-
-static int _get_mirror_event(char *params)
-{
-	int i, rtn = ME_INSYNC;
-	int max_args = 30;  /* should support at least 8-way mirrors */
-	char *args[max_args];
-	char *dev_status_str;
-	char *log_status_str;
-	char *sync_str;
-	char *p;
-	int log_argc, num_devs, num_failures=0;
-
-	if (max_args <= split_words(params, max_args, args)) {
-		syslog(LOG_ERR, "Unable to split mirror parameters: Arg list too long");
-		return -E2BIG;
-	}
-
-	/*
-	 * Unused:  0 409600 mirror
-	 * Used  :  2 253:4 253:5 400/400 1 AA 3 cluster 253:3 A
-	*/
-	num_devs = atoi(args[0]);
-	dev_status_str = args[3 + num_devs];
-	log_argc = atoi(args[4 + num_devs]);
-	log_status_str = args[4 + num_devs + log_argc];
-	sync_str = args[1 + num_devs];
-
-	/* Check for bad mirror devices */
-	for (i = 0; i < num_devs; i++) {
-		if (dev_status_str[i] == 'D') {
-			syslog(LOG_ERR, "Mirror device, %s, has failed.\n", args[i+1]);
-			num_failures++;
-		}
-	}
-
-	/* Check for bad log device */
-	if (log_status_str[0] == 'D') {
-		syslog(LOG_ERR, "Log device, %s, has failed.\n",
-		       args[3 + num_devs + log_argc]);
-		num_failures++;
-	}
-
-	if (num_failures) {
-		rtn = ME_FAILURE;
-		goto out;
-	}
-
-	p = strstr(sync_str, "/");
-	if (p) {
-		p[0] = '\0';
-		if (strcmp(sync_str, p+1))
-			rtn = ME_IGNORE;
-		p[0] = '/';
-	} else {
-		/*
-		 * How the hell did we get this?
-		 * Might mean all our parameters are screwed.
-		 */
-		syslog(LOG_ERR, "Unable to parse sync string.");
-		rtn = ME_IGNORE;
-	}
- out:
-	return rtn;
-}
-
-static void _temporary_log_fn(int level, const char *file,
-			      int line, const char *format)
-{
-	if (!strncmp(format, "WARNING: ", 9) && (level < 5))
-		syslog(LOG_CRIT, "%s", format);
-	else
-		syslog(LOG_DEBUG, "%s", format);
-}
-
-static int _remove_failed_devices(const char *device)
-{
-	int r;
-	void *handle;
-	int cmd_size = 256;	/* FIXME Use system restriction */
-	char cmd_str[cmd_size];
-	char *vg = NULL, *lv = NULL, *layer = NULL;
-
-	if (strlen(device) > 200)
-		return -ENAMETOOLONG;
-
-	if (!split_dm_name(mem_pool, device, &vg, &lv, &layer)) {
-		syslog(LOG_ERR, "Unable to determine VG name from %s",
-		       device);
-		return -ENOMEM;
-	}
-
-	/* FIXME Is any sanity-checking required on %s? */
-	if (cmd_size <= snprintf(cmd_str, cmd_size, "vgreduce --removemissing %s", vg)) {
-		/* this error should be caught above, but doesn't hurt to check again */
-		syslog(LOG_ERR, "Unable to form LVM command: Device name too long");
-		dm_pool_empty(mem_pool);  /* FIXME: not safe with multiple threads */
-		return -ENAMETOOLONG;
-	}
-
-	lvm2_log_fn(_temporary_log_fn);
-	handle = lvm2_init();
-	lvm2_log_level(handle, 1);
-	r = lvm2_run(handle, cmd_str);
-
-	dm_pool_empty(mem_pool);  /* FIXME: not safe with multiple threads */
-	return (r == 1)? 0: -1;
-}
-
-void process_event(const char *device, enum dm_event_type event)
-{
-	struct dm_task *dmt;
-	void *next = NULL;
-	uint64_t start, length;
-	char *target_type = NULL;
-	char *params;
-
-	if (pthread_mutex_trylock(&_lock)) {
-		syslog(LOG_NOTICE, "Another thread is handling an event.  Waiting...");
-		pthread_mutex_lock(&_lock);
-	}
-	/* FIXME Move inside libdevmapper */
-	if (!(dmt = dm_task_create(DM_DEVICE_STATUS))) {
-		syslog(LOG_ERR, "Unable to create dm_task.\n");
-		goto fail;
-	}
-
-	if (!dm_task_set_name(dmt, device)) {
-		syslog(LOG_ERR, "Unable to set device name.\n");
-		goto fail;
-	}
-
-	if (!dm_task_run(dmt)) {
-		syslog(LOG_ERR, "Unable to run task.\n");
-		goto fail;
-	}
-
-	do {
-		next = dm_get_next_target(dmt, next, &start, &length,
-					  &target_type, &params);
-
-		if (strcmp(target_type, "mirror")) {
-			syslog(LOG_INFO, "%s has unmirrored portion.\n", device);
-			continue;
-		}
-
-		switch(_get_mirror_event(params)) {
-		case ME_INSYNC:
-			/* FIXME: all we really know is that this
-			   _part_ of the device is in sync
-			   Also, this is not an error
-			*/
-			syslog(LOG_NOTICE, "%s is now in-sync\n", device);
-			break;
-		case ME_FAILURE:
-			syslog(LOG_ERR, "Device failure in %s\n", device);
-			if (_remove_failed_devices(device))
-				syslog(LOG_ERR, "Failed to remove faulty devices in %s\n",
-				       device);
-			/* Should check before warning user that device is now linear
-			else
-				syslog(LOG_NOTICE, "%s is now a linear device.\n",
-					device);
-			*/
-			break;
-		case ME_IGNORE:
-			break;
-		default:
-			syslog(LOG_INFO, "Unknown event received.\n");
-		}
-	} while (next);
-
- fail:
-	if (dmt)
-		dm_task_destroy(dmt);
-	pthread_mutex_unlock(&_lock);
-}
-
-int register_device(const char *device)
-{
-	syslog(LOG_INFO, "Monitoring mirror device, %s for events\n", device);
-
-	/*
-	 * Need some space for allocations.  1024 should be more
-	 * than enough for what we need (device mapper name splitting)
-	 */
-	if (!mem_pool)
-		mem_pool = dm_pool_create("mirror_dso", 1024);
-
-	if (!mem_pool)
-		return 0;
-
-	register_count++;
-
-        return 1;
-}
-
-int unregister_device(const char *device)
-{
-	if (!(--register_count)) {
-		dm_pool_destroy(mem_pool);
-		mem_pool = NULL;
-	}
-
-        return 1;
-}
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */

doc/Makefile.in

@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2004 Red Hat, Inc. All rights reserved.
-#
-# This file is part of the LVM2.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU General Public License v.2.
-#
-# 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
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-CONFSRC=example.conf
-CONFDEST=lvm.conf
-
-include $(top_srcdir)/make.tmpl
-
-install:
-	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
-		echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
-		@INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
-			$(confdir)/$(CONFDEST); \
-	fi
-

doc/README

@@ -0,0 +1 @@
+Wow!  This is really incredible documentation!

doc/example.conf

@@ -1,348 +0,0 @@
-# This is an example configuration file for the LVM2 system.
-# It contains the default settings that would be used if there was no
-# /etc/lvm/lvm.conf file.
-#
-# Refer to 'man lvm.conf' for further information including the file layout.
-#
-# To put this file in a different directory and override /etc/lvm set
-# the environment variable LVM_SYSTEM_DIR before running the tools.
-
-
-# This section allows you to configure which block devices should
-# be used by the LVM system.
-devices {
-
-    # Where do you want your volume groups to appear ?
-    dir = "/dev"
-
-    # An array of directories that contain the device nodes you wish
-    # to use with LVM2.
-    scan = [ "/dev" ]
-
-    # A filter that tells LVM2 to only use a restricted set of devices.
-    # The filter consists of an array of regular expressions.  These
-    # expressions can be delimited by a character of your choice, and
-    # prefixed with either an 'a' (for accept) or 'r' (for reject).
-    # The first expression found to match a device name determines if
-    # the device will be accepted or rejected (ignored).  Devices that
-    # don't match any patterns are accepted.
-
-    # Be careful if there there are symbolic links or multiple filesystem 
-    # entries for the same device as each name is checked separately against
-    # the list of patterns.  The effect is that if any name matches any 'a'
-    # pattern, the device is accepted; otherwise if any name matches any 'r'
-    # pattern it is rejected; otherwise it is accepted.
-
-    # Don't have more than one filter line active at once: only one gets used.
-
-    # Run vgscan after you change this parameter to ensure that
-    # the cache file gets regenerated (see below).
-    # If it doesn't do what you expect, check the output of 'vgscan -vvvv'.
-
-
-    # By default we accept every block device:
-    filter = [ "a/.*/" ]
-
-    # Exclude the cdrom drive
-    # filter = [ "r|/dev/cdrom|" ]
-
-    # When testing I like to work with just loopback devices:
-    # filter = [ "a/loop/", "r/.*/" ]
-
-    # Or maybe all loops and ide drives except hdc:
-    # filter =[ "a|loop|", "r|/dev/hdc|", "a|/dev/ide|", "r|.*|" ]
-
-    # Use anchors if you want to be really specific
-    # filter = [ "a|^/dev/hda8$|", "r/.*/" ]
-
-    # The results of the filtering are cached on disk to avoid
-    # rescanning dud devices (which can take a very long time).  By
-    # default this cache file is hidden in the /etc/lvm directory.
-    # It is safe to delete this file: the tools regenerate it.
-    cache = "/etc/lvm/.cache"
-
-    # You can turn off writing this cache file by setting this to 0.
-    write_cache_state = 1
-
-    # Advanced settings.
-
-    # List of pairs of additional acceptable block device types found 
-    # in /proc/devices with maximum (non-zero) number of partitions.
-    # types = [ "fd", 16 ]
-
-    # If sysfs is mounted (2.6 kernels) restrict device scanning to 
-    # the block devices it believes are valid.
-    # 1 enables; 0 disables.
-    sysfs_scan = 1	
-
-    # By default, LVM2 will ignore devices used as components of
-    # software RAID (md) devices by looking for md superblocks.
-    # 1 enables; 0 disables.
-    md_component_detection = 1
-}
-
-# This section that allows you to configure the nature of the
-# information that LVM2 reports.
-log {
-
-    # Controls the messages sent to stdout or stderr.
-    # There are three levels of verbosity, 3 being the most verbose.
-    verbose = 0
-
-    # Should we send log messages through syslog?
-    # 1 is yes; 0 is no.
-    syslog = 1
-
-    # Should we log error and debug messages to a file?
-    # By default there is no log file.
-    #file = "/var/log/lvm2.log"
-
-    # Should we overwrite the log file each time the program is run?
-    # By default we append.
-    overwrite = 0
-
-    # What level of log messages should we send to the log file and/or syslog?
-    # There are 6 syslog-like log levels currently in use - 2 to 7 inclusive.
-    # 7 is the most verbose (LOG_DEBUG).
-    level = 0
-    
-    # Format of output messages
-    # Whether or not (1 or 0) to indent messages according to their severity
-    indent = 1
-
-    # Whether or not (1 or 0) to display the command name on each line output
-    command_names = 0
-
-    # A prefix to use before the message text (but after the command name,
-    # if selected).  Default is two spaces, so you can see/grep the severity
-    # of each message.
-    prefix = "  "
-
-    # To make the messages look similar to the original LVM tools use:
-    #   indent = 0
-    #   command_names = 1
-    #   prefix = " -- "
-
-    # Set this if you want log messages during activation.
-    # Don't use this in low memory situations (can deadlock).
-    # activation = 0
-}
-
-# Configuration of metadata backups and archiving.  In LVM2 when we
-# talk about a 'backup' we mean making a copy of the metadata for the
-# *current* system.  The 'archive' contains old metadata configurations.
-# Backups are stored in a human readeable text format.
-backup {
-
-    # Should we maintain a backup of the current metadata configuration ?
-    # Use 1 for Yes; 0 for No.
-    # Think very hard before turning this off!
-    backup = 1
-
-    # Where shall we keep it ?
-    # Remember to back up this directory regularly!
-    backup_dir = "/etc/lvm/backup"
-
-    # Should we maintain an archive of old metadata configurations.
-    # Use 1 for Yes; 0 for No.
-    # On by default.  Think very hard before turning this off.
-    archive = 1
-
-    # Where should archived files go ?
-    # Remember to back up this directory regularly!
-    archive_dir = "/etc/lvm/archive"
-    
-    # What is the minimum number of archive files you wish to keep ?
-    retain_min = 10
-
-    # What is the minimum time you wish to keep an archive file for ?
-    retain_days = 30
-}
-
-# Settings for the running LVM2 in shell (readline) mode.
-shell {
-
-    # Number of lines of history to store in ~/.lvm_history
-    history_size = 100
-}
-
-
-# Miscellaneous global LVM2 settings
-global {
-    
-    # The file creation mask for any files and directories created.
-    # Interpreted as octal if the first digit is zero.
-    umask = 077
-
-    # Allow other users to read the files
-    #umask = 022
-
-    # Enabling test mode means that no changes to the on disk metadata
-    # will be made.  Equivalent to having the -t option on every
-    # command.  Defaults to off.
-    test = 0
-
-    # Whether or not to communicate with the kernel device-mapper.
-    # Set to 0 if you want to use the tools to manipulate LVM metadata 
-    # without activating any logical volumes.
-    # If the device-mapper kernel driver is not present in your kernel
-    # setting this to 0 should suppress the error messages.
-    activation = 1
-
-    # If we can't communicate with device-mapper, should we try running 
-    # the LVM1 tools?
-    # This option only applies to 2.4 kernels and is provided to help you
-    # switch between device-mapper kernels and LVM1 kernels.
-    # The LVM1 tools need to be installed with .lvm1 suffices
-    # e.g. vgscan.lvm1 and they will stop working after you start using
-    # the new lvm2 on-disk metadata format.
-    # The default value is set when the tools are built.
-    # fallback_to_lvm1 = 0
-
-    # The default metadata format that commands should use - "lvm1" or "lvm2".
-    # The command line override is -M1 or -M2.
-    # Defaults to "lvm1" if compiled in, else "lvm2".
-    # format = "lvm1"
-
-    # Location of proc filesystem
-    proc = "/proc"
-
-    # Type of locking to use. Defaults to file-based locking (1).
-    # Turn locking off by setting to 0 (dangerous: risks metadata corruption
-    # if LVM2 commands get run concurrently).
-    locking_type = 1
-
-    # Local non-LV directory that holds file-based locks while commands are
-    # in progress.  A directory like /tmp that may get wiped on reboot is OK.
-    locking_dir = "/var/lock/lvm"
-
-    # Other entries can go here to allow you to load shared libraries
-    # e.g. if support for LVM1 metadata was compiled as a shared library use
-    #   format_libraries = "liblvm2format1.so" 
-    # Full pathnames can be given.
-
-    # Search this directory first for shared libraries.
-    #   library_dir = "/lib"
-}
-
-activation {
-    # Device used in place of missing stripes if activating incomplete volume.
-    # For now, you need to set this up yourself first (e.g. with 'dmsetup')
-    # For example, you could make it return I/O errors using the 'error' 
-    # target or make it return zeros.
-    missing_stripe_filler = "/dev/ioerror"
-
-    # How much stack (in KB) to reserve for use while devices suspended
-    reserved_stack = 256
-
-    # How much memory (in KB) to reserve for use while devices suspended
-    reserved_memory = 8192
-
-    # Nice value used while devices suspended
-    process_priority = -18
-
-    # If volume_list is defined, each LV is only activated if there is a
-    # match against the list.
-    #   "vgname" and "vgname/lvname" are matched exactly.
-    #   "@tag" matches any tag set in the LV or VG.
-    #   "@*" matches if any tag defined on the host is also set in the LV or VG
-    #
-    # volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
-
-    # Size (in KB) of each copy operation when mirroring
-    mirror_region_size = 512
-
-    # 'mirror_image_fault_policy' and 'mirror_log_fault_policy' define
-    # how a device failure affecting a mirror is handled.
-    # A mirror is composed of mirror images (copies) and a log.
-    # A disk log ensures that a mirror does not need to be re-synced
-    # (all copies made the same) every time a machine reboots or crashes.
-    #
-    # In the event of a failure, the specified policy will be used to
-    # determine what happens:
-    #
-    # "remove" - Simply remove the faulty device and run without it.  If
-    #            the log device fails, the mirror would convert to using
-    #            an in-memory log.  This means the mirror will not
-    #            remember its sync status across crashes/reboots and
-    #            the entire mirror will be re-synced.  If a
-    #            mirror image fails, the mirror will convert to a
-    #            non-mirrored device if there is only one remaining good
-    #            copy.
-    #
-    # "allocate" - Remove the faulty device and try to allocate space on
-    #            a new device to be a replacement for the failed device.
-    #            Using this policy for the log is fast and maintains the
-    #            ability to remember sync state through crashes/reboots.
-    #            Using this policy for a mirror device is slow, as it
-    #            requires the mirror to resynchronize the devices, but it
-    #            will preserve the mirror characteristic of the device.
-    #            This policy acts like "remove" if no suitable device and
-    #            space can be allocated for the replacement.
-    #            Currently this is not implemented properly and behaves
-    #            similarly to:
-    #
-    # "allocate_anywhere" - Operates like "allocate", but it does not
-    #            require that the new space being allocated be on a
-    #            device is not part of the mirror.  For a log device
-    #            failure, this could mean that the log is allocated on
-    #            the same device as a mirror device.  For a mirror
-    #            device, this could mean that the mirror device is
-    #            allocated on the same device as another mirror device.
-    #            This policy would not be wise for mirror devices
-    #            because it would break the redundant nature of the
-    #            mirror.  This policy acts like "remove" if no suitable
-    #            device and space can be allocated for the replacement.
-
-    mirror_log_fault_policy = "allocate"
-    mirror_device_fault_policy = "remove"
-}
-
-
-####################
-# Advanced section #
-####################
-
-# Metadata settings
-#
-# metadata {
-    # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
-    # You might want to override it from the command line with 0 
-    # when running pvcreate on new PVs which are to be added to large VGs.
-
-    # pvmetadatacopies = 1
-
-    # Approximate default size of on-disk metadata areas in sectors.
-    # You should increase this if you have large volume groups or
-    # you want to retain a large on-disk history of your metadata changes.
-
-    # pvmetadatasize = 255
-
-    # List of directories holding live copies of text format metadata.
-    # These directories must not be on logical volumes!
-    # It's possible to use LVM2 with a couple of directories here,
-    # preferably on different (non-LV) filesystems, and with no other 
-    # on-disk metadata (pvmetadatacopies = 0). Or this can be in
-    # addition to on-disk metadata areas.
-    # The feature was originally added to simplify testing and is not
-    # supported under low memory situations - the machine could lock up.
-    #
-    # Never edit any files in these directories by hand unless you
-    # you are absolutely sure you know what you are doing! Use
-    # the supplied toolset to make changes (e.g. vgcfgrestore).
-
-    # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
-#}
-
-# Event daemon
-#
-# dmeventd {
-    # mirror_library is the library used when monitoring a mirror device.
-    #
-    # "libdevmapper-event-lvm2mirror.so" attempts to recover from failures.
-    # It removes failed devices from a volume group and reconfigures a
-    # mirror as necessary.
-    #
-    # mirror_library = "libdevmapper-event-lvm2mirror.so"
-#}
-

doc/example_cmdlib.c

@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * 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
- */
-
-#include "lvm2cmd.h"
-
-/* All output gets passed to this function line-by-line */
-void test_log_fn(int level, const char *file, int line, const char *format)
-{
-	/* Extract and process output here rather than printing it */
-
-	if (level != 4)
-		return;
-
-	printf("%s\n", format);
-	return;
-}
-
-int main(int argc, char **argv)
-{
-	void *handle;
-	int r;
-
-	lvm2_log_fn(test_log_fn);
-
-	handle = lvm2_init();
-
-	lvm2_log_level(handle, 1);
-	r = lvm2_run(handle, "vgs --noheadings vg1");
-
-	/* More commands here */
-
-	lvm2_exit(handle);
-
-	return r;
-}
-

doc/pvmove_outline.txt

@@ -1,52 +0,0 @@
-Let's say we have an LV, made up of three segments of different PV's,
-I've also added in the device major:minor as this will be useful
-later:
-
-+-----------------------------+
-|  PV1     |   PV2   |   PV3  | 254:3
-+----------+---------+--------+
-
-
-Now our hero decides to PV move PV2 to PV4:
-
-1. Suspend our LV (254:3), this starts queueing all io, and flushes
-   all pending io.  Once the suspend has completed we are free to change
-   the mapping table.
-
-2. Set up *another* (254:4) device with the mapping table of our LV.
-
-3. Load a new mapping table into (254:3) that has identity targets for
-   parts that aren't moving, and a mirror target for parts that are.
-
-4. Unsuspend (254:3)
-
-So now we have:
-                           destination of copy
-               +--------------------->--------------+
-               |                                    |
-+-----------------------------+               + -----------+
-| Identity | mirror  | Ident. | 254:3         |    PV4     |
-+----------+---------+--------+               +------------+
-     |         |         |
-     \/        \/        \/
-+-----------------------------+
-|  PV1     |   PV2   |   PV3  | 254:4
-+----------+---------+--------+
-
-Any writes to segment2 of the LV get intercepted by the mirror target
-who checks that that chunk has been copied to the new destination, if
-it hasn't it queues the initial copy and defers the current io until
-it has finished.  Then the current io is written to *both* PV2 and the
-PV4.
-
-5. When the copying has completed 254:3 is suspended/pending flushed.
-
-6. 254:4 is taken down
-
-7. metadata is updated on disk
-
-8. 254:3 has new mapping table loaded:
-
-+-----------------------------+
-|  PV1     |   PV4   |   PV3  | 254:3
-+----------+---------+--------+

doc/tagging.txt

@@ -1,165 +0,0 @@
-Tagging aims
-============
-  1) Ability to attach an unordered list of tags to LVM metadata objects.
-  2) Ability to add or remove tags easily.
-  3) Ability to select LVM objects for processing according to presence/absence
-     of specific tags.
-  4) Ability to control through the config file which VGs/LVs are activated 
-     on different machines using names or tags.
-  5) Ability to overlay settings from different config files e.g. override
-     some settings in a global config file locally.
-
-Clarifications
-==============
-  1) Tag character set: A-Za-z0-9_+.- 
-     Can't start with hyphen & max length is 128 (NAME_LEN).
-  2) LVM object types that can be tagged:
-       VG, LV, LV segment
-       PV - tags are stored in VG metadata so disappear when PV becomes orphaned
-     Snapshots can't be tagged, but their origin may be.
-  3) A tag can be used in place of any command line LVM object reference that
-     accepts (a) a list of objects; or (b) a single object as long as the
-     tag expands to a single object.  This is not supported everywhere yet.
-     Duplicate arguments in a list after argument expansion may get removed 
-     retaining the first copy of each argument.
-  4) Wherever there may be ambiguity of argument type, a tag must be prefixed 
-     by '@'; elsewhere an '@' prefix is optional.
-  5) LVM1 objects cannot be tagged, as the disk format doesn't support it.
-  6) Tags can be added or removed with --addtag or --deltag.
-
-Config file Extensions
-======================
-  To define host tags in config file:
-
-  tags {
-  	# Set a tag with the hostname
-	hosttags = 1
-
-	tag1 { }
-
-  	tag2 {
-		# If no exact match, tag is not set.
-		host_list = [ "hostname", "dbase" ]
-	}
-  }
-
-Activation config file example
-==============================
-  activation {
-      volume_list = [ "vg1/lvol0", "@database" ]
-  }
-
-  Matches against vgname, vgname/lvname or @tag set in *metadata*.
-  @* matches exactly against *any* tag set on the host.
-  The VG or LV only gets activated if a metadata tag matches.
-  The default if there is no match is not to activate.
-  If volume_list is not present and any tags are defined on the host 
-  then it only activates if a host tag matches a metadata tag.
-  If volume_list is not present and no tags are defined on the host 
-  then it does activate.
-
-Multiple config files
-=====================
-  (a) lvm.conf
-  (b) lvm_<host_tag>.conf
-
-  At startup, load lvm.conf.
-  Process tag settings.
-  If any host tags were defined, load lvm_tag.conf for each tag, if present.
-
-  When searching for a specific config file entry, search order is (b)
-  then (a), stopping at the first match.  
-  Within (b) use reverse order tags got set, so file for last tag set is
-  searched first.
-  New tags set in (b) *do* trigger additional config file loads. 
-
-Usage Examples
-==============
-  1) Simple activation control via metadata with static config files
-
-  lvm.conf:  (Identical on every machine - global settings)
-    tags {
-      hostname_tags = 1
-    }
-
-  From any machine in the cluster, add db1 to the list of machines that
-  activate vg1/lvol2:
-
-  lvchange --tag @db1 vg1/lvol2
-  (followed by lvchange -ay to actually activate it)
-
-
-  2) Multiple hosts.  
-
-    Activate vg1 only on the database hosts, db1 and db2.
-    Activate vg2 only on the fileserver host fs1.
-    Activate nothing initially on the fileserver backup host fsb1, but be
-    prepared for it to take over from fs1.
-
-  Option (i) - centralised admin, static configuration replicated between hosts  
-    # Add @database tag to vg1's metadata
-    vgchange --tag @database vg1
-
-    # Add @fileserver tag to vg2's metadata
-    vgchange --tag @fileserver vg2
-
-    lvm.conf:  (Identical on every machine)
-      tags {
-        database {
-          host_list = [ "db1", "db2" ]
-        }
-        fileserver {
-	  host_list = [ "fs1" ]
-        }
-        fileserverbackup {
-          host_list = [ "fsb1" ]
-        }
-      }
-
-      activation {
-        # Only activate if host has a tag that matches a metadata tag
-        volume_list = [ "@*" ]
-      }
-  
-  In the event of the fileserver host going down, vg2 can be brought up
-  on fsb1 by running *on any node* 'vgchange --tag @fileserverbackup vg2'
-  followed by 'vgchange -ay vg2'
-  
-  
-  Option (ii) - localised admin & configuation
-  (i.e. each host holds *locally* which classes of volumes to activate)
-    # Add @database tag to vg1's metadata
-    vgchange --tag @database vg1
-  
-    # Add @fileserver tag to vg2's metadata
-    vgchange --tag @fileserver vg2
-  
-    lvm.conf:  (Identical on every machine - global settings)
-      tags {
-        hosttags = 1
-      }
-  
-    lvm_db1.conf: (only needs to be on db1 - could be symlink to lvm_db.conf)
-      activation {
-        volume_list = [ "@database" ]
-      }
-  
-    lvm_db2.conf: (only needs to be on db2 - could be symlink to lvm_db.conf)
-      activation {
-        volume_list = [ "@database" ]
-      }
-  
-    lvm_fs1.conf: (only needs to be on fs1 - could be symlink to lvm_fs.conf)
-      activation {
-        volume_list = [ "@fileserver" ]
-      }
-  
-    If fileserver goes down, to bring a spare machine fsb1 in as fileserver,
-    create lvm_fsb1.conf on fsb1 (or symlink to lvm_fs.conf):
-
-      activation {
-        volume_list = [ "@fileserver" ]
-      }
-
-    and run 'vgchange -ay vg2' or 'vgchange -ay @fileserver'
-

doc/testing.txt

@@ -1,46 +0,0 @@
-Here's how I test new LVM2 builds without interfering with the stable
-LVM2 that is running the LV's on my development box.
-
-1) Create a set of loopback devices.
-
-2) Create a new directory to contain the LVM2 configuration files for
-   this setup.  (I use /etc/lvm_loops)
-
-3) Write a suitable lvm.conf file, this goes in the directory you just
-   created.  eg, my /etc/lvm_loops/lvm.conf looks like:
-
-   log {
-        file="/tmp/lvm2_loop.log"
-        level=9
-        verbose=0
-        overwrite=1
-   }
-
-   devices {
-        scan = "/dev"
-        filter = ["a/loop/", "r/.*/"]
-   }
-
-
-   The important this to note is the devices section which makes sure that
-   only the loopback devices are considered for LVM2 operations.
-
-4) When you want to use this test setup just set the environment
-   variable LVM_SYSTEM_DIR to point to your config directory
-   (/etc/lvm_loops in my case).
-
-5) It's a good idea to do a vgscan to initialise the filters:
-
-   export LVM_SYSTEM_DIR=/etc/lvm_loops
-   ./lvm vgscan
-
-   where ./lvm is the new build of LVM2 that I'm trying out.
-
-7) Test away.  Make sure that you are explicit about which lvm
-   executable you want to execute (eg, ./lvm if you are in
-   LVM2/tools).
-
-   
-
-
-

driver/README

@@ -0,0 +1 @@
+The driver directory

driver/device-mapper/README

@@ -0,0 +1,104 @@
+The main goal of this driver is to support volume management in
+general, not just for LVM.  The kernel should provide general
+services, not support specific applications.  eg, The driver has no
+concept of volume groups.
+
+The driver does this by mapping sector ranges for the logical device
+onto 'targets'.
+
+When the logical device is accessed, the make_request function looks
+up the correct target for the given sector, and then asks this target
+to do the remapping.
+
+A btree structure is used to hold the sector range -> target mapping.
+Since we know all the entries in the btree in advance we can make a
+very compact tree, omitting pointers to child nodes, (child nodes
+locations can be calculated).  Typical users would find they only have
+a handful of targets for each logical volume LV.
+
+Benchmarking with bonnie++ suggests that this is certainly no slower
+than current LVM.
+
+
+Target types are not hard coded, instead the register_mapping_type
+function should be called.  A target type is specified using three
+functions (see the header):
+
+dm_ctr_fn - takes a string and contructs a target specific piece of
+            context data.
+dm_dtr_fn - destroy contexts.
+dm_map_fn - function that takes a buffer_head and some previously
+            constructed context and performs the remapping.
+
+Currently there are two two trivial mappers, which are automatically
+registered: 'linear', and 'io_error'.  Linear alone is enough to
+implement most of LVM.
+
+
+I do not like ioctl interfaces so this driver is currently controlled
+through a /proc interface.  /proc/device-mapper/control allows you to
+create and remove devices by 'cat'ing a line of the following format:
+
+create <device name> [minor no]
+remove <device name>
+
+If you're not using devfs you'll have to do the mknod'ing yourself,
+otherwise the device will appear in /dev/device-mapper automatically.
+
+/proc/device-mapper/<device name> accepts the mapping table:
+
+begin
+<sector start> <length> <target name> <target args>...
+...
+end
+
+where <target args> are specific to the target type, eg. for a linear
+mapping:
+
+<sector start> <length> linear <major> <minor> <start>
+
+and the io-err mapping:
+
+<sector start> <length> io-err
+
+The begin/end lines around the table are nasty, they should be handled
+by open/close of the file.
+
+The interface is far from complete, currently loading a table either
+succeeds or fails, you have no way of knowing which line of the
+mapping table was erroneous.  Also there is no way to get status
+information out, though this should be easy to add, either as another
+/proc file, or just by reading the same /proc/device-mapper/<device>
+file.  I will be seperating the loading and validation of a table from
+the binding of a valid table to a device.
+
+It has been suggested that I should implement a little custom
+filesystem rather than labouring with /proc.  For example doing a
+mkdir foo in /wherever/device-mapper would create a new device. People
+waiting for a status change (eg, a mirror operation to complete) could
+poll a file.  Does the community find this an acceptable way to go ?
+
+
+At the moment the table assumes 32 bit keys (sectors), the move to 64
+bits will involve no interface changes, since the tables will be read
+in as ascii data.  A different table implementation can therefor be
+provided at another time.  Either just by changing offset_t to 64
+bits, or maybe implementing a structure which looks up the keys in
+stages (ie, 32 bits at a time).
+
+
+More interesting targets:
+
+striped mapping; given a stripe size and a number of device regions
+this would stripe data across the regions.  Especially useful, since
+we could limit each striped region to a 32 bit area and then avoid
+nasty 64 bit %'s.
+
+mirror mapping; would set off a kernel thread slowly copying data from
+one region to another, ensuring that any new writes got copied to both
+destinations correctly.  Enabling us to implement a live pvmove
+correctly.
+
+
+
+

driver/device-mapper/device-mapper.h

@@ -0,0 +1,84 @@
+/*
+ * device-mapper.h
+ *
+ * Copyright (C) 2001 Sistina Software (UK) Limited.
+ *
+ * This file is released under the GPL.
+ */
+
+/*
+ * Changelog
+ *
+ *     14/08/2001 - First version [Joe Thornber]
+ */
+
+#ifndef DEVICE_MAPPER_H
+#define DEVICE_MAPPER_H
+
+#include <linux/major.h>
+
+/* FIXME: Use value from local range for now, for co-existence with LVM 1 */
+#define DM_BLK_MAJOR 124
+
+struct dm_table;
+struct dm_dev;
+typedef unsigned int offset_t;
+
+typedef void (*dm_error_fn)(const char *message, void *private);
+
+/*
+ * constructor, destructor and map fn types
+ */
+typedef int (*dm_ctr_fn)(struct dm_table *t, offset_t b, offset_t l,
+			 char *args, void **context);
+
+typedef void (*dm_dtr_fn)(struct dm_table *t, void *c);
+typedef int (*dm_map_fn)(struct buffer_head *bh, int rw, void *context);
+typedef int (*dm_err_fn)(struct buffer_head *bh, int rw, void *context);
+typedef char *(*dm_print_fn)(void *context);
+
+/*
+ * Contructors should call this to make sure any
+ * destination devices are handled correctly
+ * (ie. opened/closed).
+ */
+int dm_table_get_device(struct dm_table *t, const char *path,
+			struct dm_dev **result);
+void dm_table_put_device(struct dm_table *table, struct dm_dev *d);
+
+/*
+ * information about a target type
+ */
+struct target_type {
+        const char *name;
+        struct module *module;
+        dm_ctr_fn ctr;
+        dm_dtr_fn dtr;
+        dm_map_fn map;
+	dm_err_fn err;
+	dm_print_fn print;
+};
+
+int dm_register_target(struct target_type *t);
+int dm_unregister_target(struct target_type *t);
+
+static inline char *next_token(char **p)
+{
+        static const char *delim = " \t";
+        char *r;
+
+        do {
+                r = strsep(p, delim);
+        } while(r && *r == 0);
+
+        return r;
+}
+
+
+#endif /* DEVICE_MAPPER_H */
+
+/*
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */

driver/device-mapper/dm-linear.c

@@ -0,0 +1,134 @@
+/*
+ * dm-linear.c
+ *
+ * Copyright (C) 2001 Sistina Software (UK) Limited.
+ *
+ * This file is released under the GPL.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/fs.h>
+#include <linux/blkdev.h>
+#include <linux/device-mapper.h>
+
+#include "dm.h"
+
+/*
+ * linear: maps a linear range of a device.
+ */
+struct linear_c {
+	long delta;		/* FIXME: we need a signed offset type */
+	struct dm_dev *dev;
+};
+
+/*
+ * construct a linear mapping.
+ * <dev_path> <offset>
+ */
+static int linear_ctr(struct dm_table *t, offset_t b, offset_t l,
+		      char *args, void **context)
+{
+	struct linear_c *lc;
+	unsigned int start;
+	int r = -EINVAL;
+	char *tok;
+	char *path;
+	char *p = args;
+
+	*context = "No device path given";
+	path = next_token(&p);
+	if (!path)
+		goto bad;
+
+	*context = "No initial offset given";
+	tok = next_token(&p);
+	if (!tok)
+		goto bad;
+	start = simple_strtoul(tok, NULL, 10);
+
+	*context = "Cannot allocate linear context private structure";
+	lc = kmalloc(sizeof(lc), GFP_KERNEL);
+	if (lc == NULL)
+		goto bad;
+
+	*context = "Cannot get target device";
+	r = dm_table_get_device(t, path, &lc->dev);
+	if (r)
+		goto bad_free;
+
+	lc->delta = (int) start - (int) b;
+	*context = lc;
+	return 0;
+
+bad_free:
+	kfree(lc);
+bad:
+	return r;
+}
+
+static void linear_dtr(struct dm_table *t, void *c)
+{
+	struct linear_c *lc = (struct linear_c *) c;
+	dm_table_put_device(t, lc->dev);
+	kfree(c);
+}
+
+static int linear_map(struct buffer_head *bh, int rw, void *context)
+{
+	struct linear_c *lc = (struct linear_c *) context;
+
+	bh->b_rdev = lc->dev->dev;
+	bh->b_rsector = bh->b_rsector + lc->delta;
+	return 1;
+}
+
+/*
+ * Debugging use only.
+ */
+static char *linear_print(void *context)
+{
+	struct linear_c *lc = (struct linear_c *)context;
+static char buf[256];
+	sprintf(buf, " %lu", lc->delta);
+	return buf;
+}
+
+static struct target_type linear_target = {
+	name: "linear",
+	module: THIS_MODULE,
+	ctr: linear_ctr,
+	dtr: linear_dtr,
+	map: linear_map,
+	print: linear_print,
+};
+
+static int __init linear_init(void)
+{
+	int r = dm_register_target(&linear_target);
+
+	if (r < 0)
+		printk(KERN_ERR
+		       "Device mapper: Linear: register failed %d\n", r);
+
+	return r;
+}
+
+static void __exit linear_exit(void)
+{
+	int r = dm_unregister_target(&linear_target);
+
+	if (r < 0)
+		printk(KERN_ERR
+		       "Device mapper: Linear: unregister failed %d\n", r);
+}
+
+module_init(linear_init);
+module_exit(linear_exit);
+
+MODULE_AUTHOR("Joe Thornber <thornber@uk.sistina.com>");
+MODULE_DESCRIPTION("Device Mapper: Linear mapping");
+MODULE_LICENSE("GPL");
+

driver/device-mapper/dm-table.c

@@ -0,0 +1,340 @@
+/*
+ * dm-table.c
+ *
+ * Copyright (C) 2001 Sistina Software (UK) Limited.
+ *
+ * This file is released under the GPL.
+ */
+
+/*
+ * Changelog
+ *
+ *     16/08/2001 - First version [Joe Thornber]
+ */
+
+#include "dm.h"
+
+/* ceiling(n / size) * size */
+static inline ulong round_up(ulong n, ulong size)
+{
+	ulong r = n % size;
+	return n + (r ? (size - r) : 0);
+}
+
+/* ceiling(n / size) */
+static inline ulong div_up(ulong n, ulong size)
+{
+	return round_up(n, size) / size;
+}
+
+/* similar to ceiling(log_size(n)) */
+static uint int_log(ulong n, ulong base)
+{
+	int result = 0;
+
+	while (n > 1) {
+		n = div_up(n, base);
+		result++;
+	}
+
+	return result;
+}
+
+/*
+ * return the highest key that you could lookup
+ * from the n'th node on level l of the btree.
+ */
+static offset_t high(struct dm_table *t, int l, int n)
+{
+	for (; l < t->depth - 1; l++)
+		n = get_child(n, CHILDREN_PER_NODE - 1);
+
+	if (n >= t->counts[l])
+		return (offset_t) -1;
+
+	return get_node(t, l, n)[KEYS_PER_NODE - 1];
+}
+
+/*
+ * fills in a level of the btree based on the
+ * highs of the level below it.
+ */
+static int setup_btree_index(int l, struct dm_table *t)
+{
+	int n, k;
+	offset_t *node;
+
+	for (n = 0; n < t->counts[l]; n++) {
+		node = get_node(t, l, n);
+
+		for (k = 0; k < KEYS_PER_NODE; k++)
+			node[k] = high(t, l + 1, get_child(n, k));
+	}
+
+	return 0;
+}
+
+/*
+ * highs, and targets are managed as dynamic
+ * arrays during a table load.
+ */
+static int alloc_targets(struct dm_table *t, int num)
+{
+	offset_t *n_highs;
+	struct target *n_targets;
+	int n = t->num_targets;
+	int size = (sizeof(struct target) + sizeof(offset_t)) * num;
+
+	n_highs = vmalloc(size);
+	if (!n_highs)
+		return -ENOMEM;
+
+	n_targets = (struct target *) (n_highs + num);
+
+	if (n) {
+		memcpy(n_highs, t->highs, sizeof(*n_highs) * n);
+		memcpy(n_targets, t->targets, sizeof(*n_targets) * n);
+	}
+
+	vfree(t->highs);
+
+	t->num_allocated = num;
+	t->highs = n_highs;
+	t->targets = n_targets;
+
+	return 0;
+}
+
+struct dm_table *dm_table_create(void)
+{
+	struct dm_table *t = kmalloc(sizeof(struct dm_table), GFP_NOIO);
+
+	if (!t)
+		return 0;
+
+	memset(t, 0, sizeof(*t));
+	INIT_LIST_HEAD(&t->devices);
+
+	/* allocate a single nodes worth of targets to
+	   begin with */
+	if (alloc_targets(t, KEYS_PER_NODE)) {
+		kfree(t);
+		t = 0;
+	}
+
+	return t;
+}
+
+static void free_devices(struct list_head *devices)
+{
+	struct list_head *tmp, *next;
+
+	for (tmp = devices->next; tmp != devices; tmp = next) {
+		struct dm_dev *dd = list_entry(tmp, struct dm_dev, list);
+		next = tmp->next;
+		kfree(dd);
+	}
+}
+
+void dm_table_destroy(struct dm_table *t)
+{
+	int i;
+
+	/* free the indexes (see dm_table_complete) */
+	if (t->depth >= 2)
+		vfree(t->index[t->depth - 2]);
+
+
+	/* free the targets */
+	for (i = 0; i < t->num_targets; i++) {
+		struct target *tgt = &t->targets[i];
+		if (tgt->type->dtr)
+			tgt->type->dtr(t, tgt->private);
+	}
+
+	vfree(t->highs);
+
+	/* free the device list */
+	if (t->devices.next != &t->devices) {
+		WARN("there are still devices present, someone isn't "
+		     "calling dm_table_remove_device");
+
+		free_devices(&t->devices);
+	}
+
+	kfree(t);
+}
+
+/*
+ * Checks to see if we need to extend
+ * highs or targets.
+ */
+static inline int check_space(struct dm_table *t)
+{
+	if (t->num_targets >= t->num_allocated)
+		return alloc_targets(t, t->num_allocated * 2);
+
+	return 0;
+}
+
+
+/*
+ * convert a device path to a kdev_t.
+ */
+int lookup_device(const char *path, kdev_t *dev)
+{
+       int r;
+       struct nameidata nd;
+       struct inode *inode;
+
+       if (!path_init(path, LOOKUP_FOLLOW, &nd))
+               return 0;
+
+       if ((r = path_walk(path, &nd)))
+               goto bad;
+
+       inode = nd.dentry->d_inode;
+       if (!inode) {
+               r = -ENOENT;
+               goto bad;
+       }
+
+       if (!S_ISBLK(inode->i_mode)) {
+               r = -EINVAL;
+               goto bad;
+       }
+
+       *dev = inode->i_rdev;
+
+ bad:
+       path_release(&nd);
+       return r;
+}
+
+/*
+ * see if we've already got a device in the list.
+ */
+static struct dm_dev *find_device(struct list_head *l, kdev_t dev)
+{
+	struct list_head *tmp;
+
+	for (tmp = l->next; tmp != l; tmp = tmp->next) {
+
+		struct dm_dev *dd = list_entry(tmp, struct dm_dev, list);
+		if (dd->dev == dev)
+			return dd;
+	}
+
+       return 0;
+}
+
+/*
+ * add a device to the list, or just increment the
+ * usage count if it's already present.
+ */
+int dm_table_get_device(struct dm_table *t, const char *path,
+			struct dm_dev **result)
+{
+	int r;
+	kdev_t dev;
+	struct dm_dev *dd;
+
+	/* convert the path to a device */
+	if ((r = lookup_device(path, &dev)))
+		return r;
+
+	dd = find_device(&t->devices, dev);
+	if (!dd) {
+		dd = kmalloc(sizeof(*dd), GFP_KERNEL);
+		if (!dd)
+			return -ENOMEM;
+
+		dd->dev = dev;
+		dd->bd = 0;
+		atomic_set(&dd->count, 0);
+		list_add(&dd->list, &t->devices);
+	}
+	atomic_inc(&dd->count);
+	*result = dd;
+
+	return 0;
+}
+/*
+ * decrement a devices use count and remove it if
+ * neccessary.
+ */
+void dm_table_put_device(struct dm_table *t, struct dm_dev *dd)
+{
+       if (atomic_dec_and_test(&dd->count)) {
+	       list_del(&dd->list);
+               kfree(dd);
+       }
+}
+
+/*
+ * adds a target to the map
+ */
+int dm_table_add_target(struct dm_table *t, offset_t high,
+			struct target_type *type, void *private)
+{
+	int r, n;
+
+	if ((r = check_space(t)))
+		return r;
+
+	n = t->num_targets++;
+	t->highs[n] = high;
+	t->targets[n].type = type;
+	t->targets[n].private = private;
+
+	return 0;
+}
+
+
+static int setup_indexes(struct dm_table *t)
+{
+	int i, total = 0;
+	offset_t *indexes;
+
+	/* allocate the space for *all* the indexes */
+	for (i = t->depth - 2; i >= 0; i--) {
+		t->counts[i] = div_up(t->counts[i + 1], CHILDREN_PER_NODE);
+		total += t->counts[i];
+	}
+
+	if (!(indexes = vmalloc(NODE_SIZE * total)))
+		return -ENOMEM;
+
+	/* set up internal nodes, bottom-up */
+	for (i = t->depth - 2, total = 0; i >= 0; i--) {
+		t->index[i] = indexes + (KEYS_PER_NODE * t->counts[i]);
+		setup_btree_index(i, t);
+	}
+
+	return 0;
+}
+
+
+/*
+ * builds the btree to index the map
+ */
+int dm_table_complete(struct dm_table *t)
+{
+	int leaf_nodes, r = 0;
+
+	/* how many indexes will the btree have ? */
+	leaf_nodes = div_up(t->num_targets, KEYS_PER_NODE);
+	t->depth = 1 + int_log(leaf_nodes, CHILDREN_PER_NODE);
+
+	/* leaf layer has already been set up */
+	t->counts[t->depth - 1] = leaf_nodes;
+	t->index[t->depth - 1] = t->highs;
+
+	if (t->depth >= 2)
+		r = setup_indexes(t);
+
+	return r;
+}
+
+EXPORT_SYMBOL(dm_table_get_device);
+EXPORT_SYMBOL(dm_table_put_device);

driver/device-mapper/dm-target.c

@@ -0,0 +1,180 @@
+/*
+ * dm-target.c
+ *
+ * Copyright (C) 2001 Sistina Software (UK) Limited
+ *
+ * This file is released under the GPL.
+ */
+
+/*
+ * 16/08/2001 - First Version [Joe Thornber]
+ */
+
+#include "dm.h"
+#include <linux/kmod.h>
+
+struct tt_internal {
+	struct target_type tt;
+
+        struct list_head list;
+        long use;
+};
+
+static LIST_HEAD(_targets);
+static rwlock_t _lock = RW_LOCK_UNLOCKED;
+
+#define DM_MOD_NAME_SIZE 32
+
+static inline struct tt_internal *__find_target_type(const char *name)
+{
+	struct list_head *tmp;
+	struct tt_internal *ti;
+
+	for(tmp = _targets.next; tmp != &_targets; tmp = tmp->next) {
+
+		ti = list_entry(tmp, struct tt_internal, list);
+		if (!strcmp(name, ti->tt.name))
+			return ti;
+	}
+
+	return 0;
+}
+
+static struct tt_internal *get_target_type(const char *name)
+{
+	struct tt_internal *ti;
+
+	read_lock(&_lock);
+	ti = __find_target_type(name);
+
+	if (ti) {
+		if (ti->use == 0 && ti->tt.module)
+			__MOD_INC_USE_COUNT(ti->tt.module);
+		ti->use++;
+	}
+	read_unlock(&_lock);
+
+	return ti;
+}
+
+static void load_module(const char *name)
+{
+	char module_name[DM_MOD_NAME_SIZE] = "dm-";
+
+	/* Length check for strcat() below */
+	if (strlen(name) > (DM_MOD_NAME_SIZE - 4))
+		return;
+
+	strcat(module_name, name);
+	request_module(module_name);
+}
+
+struct target_type *dm_get_target_type(const char *name)
+{
+	struct tt_internal *ti = get_target_type(name);
+
+	if (!ti) {
+		load_module(name);
+		ti = get_target_type(name);
+	}
+
+	return ti ? &ti->tt : 0;
+}
+
+void dm_put_target_type(struct target_type *t)
+{
+	struct tt_internal *ti = (struct tt_internal *) t;
+
+	read_lock(&_lock);
+	if (--ti->use == 0 && ti->tt.module)
+		__MOD_DEC_USE_COUNT(ti->tt.module);
+
+	if (ti->use < 0)
+		BUG();
+	read_unlock(&_lock);
+}
+
+static struct tt_internal *alloc_target(struct target_type *t)
+{
+	struct tt_internal *ti = kmalloc(sizeof(*ti), GFP_KERNEL);
+
+	if (ti) {
+		memset(ti, 0, sizeof(*ti));
+		ti->tt = *t;
+	}
+
+	return ti;
+}
+
+int dm_register_target(struct target_type *t)
+{
+	int rv = 0;
+	struct tt_internal *ti = alloc_target(t);
+
+	if (!ti)
+		return -ENOMEM;
+
+	write_lock(&_lock);
+	if (__find_target_type(t->name))
+		rv = -EEXIST;
+	else
+		list_add(&ti->list, &_targets);
+
+	write_unlock(&_lock);
+	return rv;
+}
+
+int dm_unregister_target(struct target_type *t)
+{
+	struct tt_internal *ti = (struct tt_internal *) t;
+	int rv = -ETXTBSY;
+
+	write_lock(&_lock);
+	if (ti->use == 0) {
+		list_del(&ti->list);
+		kfree(ti);
+		rv = 0;
+	}
+	write_unlock(&_lock);
+
+	return rv;
+}
+
+/*
+ * io-err: always fails an io, useful for bringing
+ * up LV's that have holes in them.
+ */
+static int io_err_ctr(struct dm_table *t, offset_t b, offset_t l,
+		      char *args, void **context)
+{
+	*context = 0;
+	return 0;
+}
+
+static void io_err_dtr(struct dm_table *t, void *c)
+{
+	/* empty */
+}
+
+static int io_err_map(struct buffer_head *bh, int rw, void *context)
+{
+	buffer_IO_error(bh);
+	return 0;
+}
+
+static struct target_type error_target = {
+	name: "error",
+	ctr: io_err_ctr,
+	dtr: io_err_dtr,
+	map: io_err_map
+};
+
+
+int dm_target_init(void)
+{
+	return dm_register_target(&error_target);
+}
+
+EXPORT_SYMBOL(dm_register_target);
+EXPORT_SYMBOL(dm_unregister_target);
+

driver/device-mapper/dm.c

@@ -0,0 +1,963 @@
+/*
+ * device-mapper.c
+ *
+ * Copyright (C) 2001 Sistina Software
+ *
+ * This software 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, or (at
+ * your option) any later version.
+ *
+ * This software 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 GNU CC; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Changelog
+ *
+ *    14/08/2001 - First Version [Joe Thornber]
+ */
+
+#include "dm.h"
+#include "dmfs.h"
+
+#include <linux/blkpg.h>
+#include <linux/blkdev.h>
+#include <linux/kmod.h>
+
+/* we only need this for the lv_bmap struct definition, not happy */
+#include <linux/lvm.h>
+
+#define MAX_DEVICES 64
+#define DEFAULT_READ_AHEAD 64
+
+static int major = 0;
+const char *_name = "device-mapper";
+int _version[3] = {0, 1, 0};
+
+struct io_hook {
+	struct mapped_device *md;
+	struct target *target;
+	int rw;
+
+	void (*end_io)(struct buffer_head * bh, int uptodate);
+	void *context;
+};
+
+kmem_cache_t *_io_hook_cache;
+
+#define rl down_read(&_dev_lock)
+#define ru up_read(&_dev_lock)
+#define wl down_write(&_dev_lock)
+#define wu up_write(&_dev_lock)
+
+struct rw_semaphore _dev_lock;
+static struct mapped_device *_devs[MAX_DEVICES];
+
+/* block device arrays */
+static int _block_size[MAX_DEVICES];
+static int _blksize_size[MAX_DEVICES];
+static int _hardsect_size[MAX_DEVICES];
+
+const char *_fs_dir = "device-mapper";
+static devfs_handle_t _dev_dir;
+
+static int request(request_queue_t *q, int rw, struct buffer_head *bh);
+static int dm_user_bmap(struct inode *inode, struct lv_bmap *lvb);
+
+/*
+ * setup and teardown the driver
+ */
+static int __init dm_init(void)
+{
+	int ret = -ENOMEM;
+
+	init_rwsem(&_dev_lock);
+
+	_io_hook_cache = kmem_cache_create("dm io hooks",
+					   sizeof(struct io_hook),
+					   0, 0, NULL, NULL);
+
+	if (!_io_hook_cache)
+		goto err;
+
+	ret = dmfs_init();
+	if (ret < 0)
+		goto err_kmem_cache_destroy;
+
+	ret = dm_target_init();
+	if (ret)
+		goto err_kmem_cache_destroy;
+
+	ret = devfs_register_blkdev(major, _name, &dm_blk_dops);
+	if (ret < 0)
+		goto err_blkdev;
+
+	if (major == 0)
+		major = ret;
+
+	/* set up the arrays */
+	read_ahead[major] = DEFAULT_READ_AHEAD;
+	blk_size[major] = _block_size;
+	blksize_size[major] = _blksize_size;
+	hardsect_size[major] = _hardsect_size;
+
+	ret = -EIO;
+
+	blk_queue_make_request(BLK_DEFAULT_QUEUE(major), request);
+
+	_dev_dir = devfs_mk_dir(0, _fs_dir, NULL);
+
+	printk(KERN_INFO "%s %d.%d.%d initialised\n", _name,
+	       _version[0], _version[1], _version[2]);
+	return 0;
+
+err_blkdev:
+	printk(KERN_ERR "%s -- register_blkdev failed\n", _name);
+err_kmem_cache_destroy:
+	kmem_cache_destroy(_io_hook_cache);
+err:
+	return ret;
+}
+
+static void __exit dm_exit(void)
+{
+	dmfs_exit();
+
+	if (kmem_cache_destroy(_io_hook_cache))
+		WARN("it looks like there are still some io_hooks allocated");
+
+
+	if (devfs_unregister_blkdev(major, _name) < 0)
+		printk(KERN_ERR "%s -- unregister_blkdev failed\n", _name);
+
+	read_ahead[major] = 0;
+	blk_size[major] = NULL;
+	blksize_size[major] = NULL;
+	hardsect_size[major] = NULL;
+
+	printk(KERN_INFO "%s %d.%d.%d cleaned up\n", _name,
+	       _version[0], _version[1], _version[2]);
+}
+
+#ifdef CONFIG_HOTPLUG
+static void dm_sbin_hotplug(struct mapped_device *md, char *action, int minor)
+{
+	int i;
+	char *argv[3];
+	char *envp[7];
+	char name[DM_NAME_LEN + 16];
+	char dev_major[16], dev_minor[16];
+
+	if (!hotplug_path[0])
+		return;
+
+	if (!current->fs->root)
+		return;
+
+	sprintf(name, "DMNAME=%s\n", md->name);
+	sprintf(dev_major, "MAJOR=%d", major);
+	sprintf(dev_minor, "MINOR=%d", minor);
+
+	i = 0;
+	argv[i++] = hotplug_path;
+	argv[i++] = "devmap";
+	argv[i] = 0;
+
+	i = 0;
+	envp[i++] = "HOME=/";
+	envp[i++] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
+	envp[i++] = name;
+	envp[i++] = action;
+	envp[i++] = dev_minor;
+	envp[i++] = dev_major;
+	envp[i] = 0;
+
+	call_usermodehelper(argv[0], argv, envp);
+}
+#else
+#define dm_sbin_hotplug(md, action, minor) do { } while(0)
+#endif /* CONFIG_HOTPLUG */
+
+/*
+ * block device functions
+ */
+static int dm_blk_open(struct inode *inode, struct file *file)
+{
+	int minor = MINOR(inode->i_rdev);
+	struct mapped_device *md;
+
+	if (minor >= MAX_DEVICES)
+		return -ENXIO;
+
+	wl;
+	md = _devs[minor];
+
+	if (!md || !is_active(md)) {
+		wu;
+		return -ENXIO;
+	}
+
+	md->use_count++;
+	wu;
+
+	return 0;
+}
+
+static int dm_blk_close(struct inode *inode, struct file *file)
+{
+	int minor = MINOR(inode->i_rdev);
+	struct mapped_device *md;
+
+	if (minor >= MAX_DEVICES)
+		return -ENXIO;
+
+	wl;
+	md = _devs[minor];
+	if (!md || md->use_count < 1) {
+		WARN("reference count in mapped_device incorrect");
+		wu;
+		return -ENXIO;
+	}
+
+	md->use_count--;
+	wu;
+
+	return 0;
+}
+
+/* In 512-byte units */
+#define VOLUME_SIZE(minor) (_block_size[(minor)] >> 1)
+
+static int dm_blk_ioctl(struct inode *inode, struct file *file,
+			uint command, ulong a)
+{
+	int minor = MINOR(inode->i_rdev);
+	long size;
+
+	if (minor >= MAX_DEVICES)
+		return -ENXIO;
+
+	switch (command) {
+	case BLKSSZGET:
+	case BLKBSZGET:
+	case BLKROGET:
+	case BLKROSET:
+	case BLKRASET:
+	case BLKRAGET:
+	case BLKFLSBUF:
+#if 0
+	case BLKELVSET:
+	case BLKELVGET:
+#endif
+		return blk_ioctl(inode->i_rdev, command, a);
+		break;
+
+	case BLKGETSIZE:
+		size = VOLUME_SIZE(minor);
+		if (copy_to_user((void *) a, &size, sizeof (long)))
+			return -EFAULT;
+		break;
+
+	case BLKGETSIZE64:
+		size = VOLUME_SIZE(minor);
+		if (put_user((u64)size, (u64 *)a))
+			return -EFAULT;
+		break;
+
+	case BLKRRPART:
+		return -EINVAL;
+
+	case LV_BMAP:
+		return dm_user_bmap(inode, (struct lv_bmap *) a);
+
+	default:
+		WARN("unknown block ioctl %d", command);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static inline struct io_hook *alloc_io_hook(void)
+{
+	return kmem_cache_alloc(_io_hook_cache, GFP_NOIO);
+}
+
+static inline void free_io_hook(struct io_hook *ih)
+{
+	kmem_cache_free(_io_hook_cache, ih);
+}
+
+/*
+ * FIXME: need to decide if deferred_io's need
+ * their own slab, I say no for now since they are
+ * only used when the device is suspended.
+ */
+static inline struct deferred_io *alloc_deferred(void)
+{
+	return kmalloc(sizeof(struct deferred_io), GFP_NOIO);
+}
+
+static inline void free_deferred(struct deferred_io *di)
+{
+	kfree(di);
+}
+
+/*
+ * call a targets optional error function if
+ * an io failed.
+ */
+static inline int call_err_fn(struct io_hook *ih, struct buffer_head *bh)
+{
+	dm_err_fn err = ih->target->type->err;
+	if (err)
+		return err(bh, ih->rw, ih->target->private);
+
+	return 0;
+}
+
+/*
+ * bh->b_end_io routine that decrements the
+ * pending count and then calls the original
+ * bh->b_end_io fn.
+ */
+static void dec_pending(struct buffer_head *bh, int uptodate)
+{
+	struct io_hook *ih = bh->b_private;
+
+	if (!uptodate && call_err_fn(ih, bh))
+		return;
+
+	if (atomic_dec_and_test(&ih->md->pending))
+		/* nudge anyone waiting on suspend queue */
+		wake_up(&ih->md->wait);
+
+	bh->b_end_io = ih->end_io;
+	bh->b_private = ih->context;
+	free_io_hook(ih);
+
+	bh->b_end_io(bh, uptodate);
+}
+
+/*
+ * add the bh to the list of deferred io.
+ */
+static int queue_io(struct mapped_device *md, struct buffer_head *bh, int rw)
+{
+	struct deferred_io *di = alloc_deferred();
+
+	if (!di)
+		return -ENOMEM;
+
+	wl;
+	if (test_bit(DM_ACTIVE, &md->state)) {
+		wu;
+		return 0;
+	}
+
+	di->bh = bh;
+	di->rw = rw;
+	di->next = md->deferred;
+	md->deferred = di;
+	wu;
+
+	return 1;
+}
+
+/*
+ * do the bh mapping for a given leaf
+ */
+static inline int __map_buffer(struct mapped_device *md,
+			       struct buffer_head *bh, int rw, int leaf)
+{
+	int r;
+	dm_map_fn fn;
+	void *context;
+	struct io_hook *ih = NULL;
+	struct target *ti = md->map->targets + leaf;
+
+	fn = ti->type->map;
+	context = ti->private;
+
+	ih = alloc_io_hook();
+
+	if (!ih)
+		return 0;
+
+	ih->md = md;
+	ih->rw = rw;
+	ih->target = ti;
+	ih->end_io = bh->b_end_io;
+	ih->context = bh->b_private;
+
+	r = fn(bh, rw, context);
+
+	if (r > 0) {
+		/* hook the end io request fn */
+		atomic_inc(&md->pending);
+		bh->b_end_io = dec_pending;
+		bh->b_private = ih;
+
+	} else if (r == 0)
+		/* we don't need to hook */
+		free_io_hook(ih);
+
+	else if (r < 0) {
+		free_io_hook(ih);
+		return 0;
+	}
+
+	return 1;
+}
+
+/*
+ * search the btree for the correct target.
+ */
+static inline int __find_node(struct dm_table *t, struct buffer_head *bh)
+{
+	int l, n = 0, k = 0;
+	offset_t *node;
+
+	for (l = 0; l < t->depth; l++) {
+		n = get_child(n, k);
+		node = get_node(t, l, n);
+
+		for (k = 0; k < KEYS_PER_NODE; k++)
+			if (node[k] >= bh->b_rsector)
+				break;
+	}
+
+	return (KEYS_PER_NODE * n) + k;
+}
+
+static int request(request_queue_t *q, int rw, struct buffer_head *bh)
+{
+	struct mapped_device *md;
+	int r, minor = MINOR(bh->b_rdev);
+
+	if (minor >= MAX_DEVICES)
+		goto bad_no_lock;
+
+	rl;
+	md = _devs[minor];
+
+	if (!md || !md->map)
+		goto bad;
+
+	/* if we're suspended we have to queue this io for later */
+	if (!test_bit(DM_ACTIVE, &md->state)) {
+		ru;
+		r = queue_io(md, bh, rw);
+
+		if (r < 0)
+			goto bad_no_lock;
+
+		else if (r > 0)
+			return 0; /* deferred successfully */
+
+		rl;	/* FIXME: there's still a race here */
+	}
+
+	if (!__map_buffer(md, bh, rw, __find_node(md->map, bh)))
+		goto bad;
+
+	ru;
+	return 1;
+
+ bad:
+	ru;
+
+ bad_no_lock:
+	buffer_IO_error(bh);
+	return 0;
+}
+
+static int check_dev_size(int minor, unsigned long block)
+{
+	/* FIXME: check this */
+	unsigned long max_sector = (_block_size[minor] << 1) + 1;
+	unsigned long sector = (block + 1) * (_blksize_size[minor] >> 9);
+
+	return (sector > max_sector) ? 0 : 1;
+}
+
+/*
+ * creates a dummy buffer head and maps it (for lilo).
+ */
+static int do_bmap(kdev_t dev, unsigned long block,
+		   kdev_t *r_dev, unsigned long *r_block)
+{
+	struct mapped_device *md;
+	struct buffer_head bh;
+	int minor = MINOR(dev), r;
+	struct target *t;
+
+	rl;
+	if ((minor >= MAX_DEVICES) || !(md = _devs[minor]) ||
+	    !test_bit(DM_ACTIVE, &md->state)) {
+		r = -ENXIO;
+		goto out;
+	}
+
+	if (!check_dev_size(minor, block)) {
+		r = -EINVAL;
+		goto out;
+	}
+
+	/* setup dummy bh */
+	memset(&bh, 0, sizeof(bh));
+	bh.b_blocknr = block;
+	bh.b_dev = bh.b_rdev = dev;
+	bh.b_size = _blksize_size[minor];
+	bh.b_rsector = block * (bh.b_size >> 9);
+
+	/* find target */
+	t = md->map->targets + __find_node(md->map, &bh);
+
+	/* do the mapping */
+	r = t->type->map(&bh, READ, t->private);
+
+	*r_dev = bh.b_rdev;
+	*r_block = bh.b_rsector / (bh.b_size >> 9);
+
+ out:
+	ru;
+	return r;
+}
+
+/*
+ * marshals arguments and results between user and
+ * kernel space.
+ */
+static int dm_user_bmap(struct inode *inode, struct lv_bmap *lvb)
+{
+	unsigned long block, r_block;
+	kdev_t r_dev;
+	int r;
+
+	if (get_user(block, &lvb->lv_block))
+		return -EFAULT;
+
+	if ((r = do_bmap(inode->i_rdev, block, &r_dev, &r_block)))
+		return r;
+
+	if (put_user(kdev_t_to_nr(r_dev), &lvb->lv_dev) ||
+	    put_user(r_block, &lvb->lv_block))
+		return -EFAULT;
+
+	return 0;
+}
+
+/*
+ * see if the device with a specific minor # is
+ * free.
+ */
+static inline int __specific_dev(int minor)
+{
+	if (minor > MAX_DEVICES) {
+		WARN("request for a mapped_device > than MAX_DEVICES");
+		return 0;
+	}
+
+	if (!_devs[minor])
+		return minor;
+
+	return -1;
+}
+
+/*
+ * find the first free device.
+ */
+static inline int __any_old_dev(void)
+{
+	int i;
+
+	for (i = 0; i < MAX_DEVICES; i++)
+		if (!_devs[i])
+			return i;
+
+	return -1;
+}
+
+/*
+ * allocate and initialise a blank device.
+ */
+static struct mapped_device *alloc_dev(int minor)
+{
+	struct mapped_device *md = kmalloc(sizeof(*md), GFP_KERNEL);
+
+	if (!md)
+		return 0;
+
+	memset(md, 0, sizeof (*md));
+
+	wl;
+	minor = (minor < 0) ? __any_old_dev() : __specific_dev(minor);
+
+	if (minor < 0) {
+		WARN("no free devices available");
+		wu;
+		kfree(md);
+		return 0;
+	}
+
+	md->dev = MKDEV(DM_BLK_MAJOR, minor);
+	md->name[0] = '\0';
+	md->state = 0;
+
+	init_waitqueue_head(&md->wait);
+
+	_devs[minor] = md;
+	wu;
+
+	return md;
+}
+
+/*
+ * open a device so we can use it as a map
+ * destination.
+ */
+static int open_dev(struct dm_dev *d)
+{
+       int err;
+
+       if (d->bd)
+	       BUG();
+
+       if (!(d->bd = bdget(kdev_t_to_nr(d->dev))))
+               return -ENOMEM;
+
+       if ((err = blkdev_get(d->bd, FMODE_READ|FMODE_WRITE, 0, BDEV_FILE))) {
+               bdput(d->bd);
+               return err;
+       }
+
+       return 0;
+}
+
+/*
+ * close a device that we've been using.
+ */
+static void close_dev(struct dm_dev *d)
+{
+	if (!d->bd)
+		return;
+
+	blkdev_put(d->bd, BDEV_FILE);
+	bdput(d->bd);
+	d->bd = 0;
+}
+
+/*
+ * Close a list of devices.
+ */
+static void close_devices(struct list_head *devices)
+{
+	struct list_head *tmp;
+
+	for (tmp = devices->next; tmp != devices; tmp = tmp->next) {
+		struct dm_dev *dd = list_entry(tmp, struct dm_dev, list);
+		close_dev(dd);
+	}
+}
+
+/*
+ * Open a list of devices.
+ */
+static int open_devices(struct list_head *devices)
+{
+	int r = 0;
+	struct list_head *tmp;
+
+	for (tmp = devices->next; tmp != devices; tmp = tmp->next) {
+		struct dm_dev *dd = list_entry(tmp, struct dm_dev, list);
+		if ((r = open_dev(dd)))
+			goto bad;
+	}
+	return 0;
+
+ bad:
+	close_devices(devices);
+	return r;
+}
+
+
+struct mapped_device *dm_find_by_minor(int minor)
+{
+	struct mapped_device *md;
+
+	rl;
+	md = _devs[minor];
+	ru;
+
+	return md;
+}
+
+static int register_device(struct mapped_device *md)
+{
+	md->devfs_entry =
+		devfs_register(_dev_dir, md->name, DEVFS_FL_CURRENT_OWNER,
+			       MAJOR(md->dev), MINOR(md->dev),
+			       S_IFBLK | S_IRUSR | S_IWUSR | S_IRGRP,
+			       &dm_blk_dops, NULL);
+
+	return 0;
+}
+
+static int unregister_device(struct mapped_device *md)
+{
+	devfs_unregister(md->devfs_entry);
+	return 0;
+}
+
+/*
+ * constructor for a new device
+ */
+struct mapped_device *dm_create(const char *name, int minor)
+{
+	int r;
+	struct mapped_device *md;
+
+	if (minor >= MAX_DEVICES)
+		return ERR_PTR(-ENXIO);
+
+	if (!(md = alloc_dev(minor)))
+		return ERR_PTR(-ENXIO);
+
+	wl;
+	strcpy(md->name, name);
+	_devs[minor] = md;
+	if ((r = register_device(md))) {
+		wu;
+		return ERR_PTR(r);
+	}
+	wu;
+
+	dm_sbin_hotplug(md, "ACTION=create", minor);
+
+	return md;
+}
+
+/*
+ * destructor for the device.  md->map is
+ * deliberately not destroyed, dm-fs should manage
+ * table objects.
+ */
+int dm_remove(struct mapped_device *md)
+{
+	int minor, r;
+
+	wl;
+	if (md->use_count) {
+		wu;
+		return -EPERM;
+	}
+
+	if ((r = unregister_device(md))) {
+		wu;
+		return r;
+	}
+
+	minor = MINOR(md->dev);
+	_devs[minor] = 0;
+	wu;
+
+	dm_sbin_hotplug(md, "ACTION=remove", minor);
+	kfree(md);
+
+	return 0;
+}
+
+/*
+ * the hardsect size for a mapped device is the
+ * smallest hard sect size from the devices it
+ * maps onto.
+ */
+static int __find_hardsect_size(struct list_head *devices)
+{
+	int result = INT_MAX, size;
+	struct list_head *tmp;
+
+	for (tmp = devices->next; tmp != devices; tmp = tmp->next) {
+		struct dm_dev *dd = list_entry(tmp, struct dm_dev, list);
+		size = get_hardsect_size(dd->dev);
+		if (size < result)
+			result = size;
+	}
+	return result;
+}
+
+/*
+ * Bind a table to the device.
+ */
+void __bind(struct mapped_device *md, struct dm_table *t)
+{
+	int minor = MINOR(md->dev);
+
+	md->map = t;
+
+	/* in k */
+	_block_size[minor] = (t->highs[t->num_targets - 1] + 1) >> 1;
+
+	_blksize_size[minor] = BLOCK_SIZE;
+	_hardsect_size[minor] = __find_hardsect_size(&t->devices);
+	register_disk(NULL, md->dev, 1, &dm_blk_dops, _block_size[minor]);
+}
+
+/*
+ * requeue the deferred buffer_heads by calling
+ * generic_make_request.
+ */
+static void __flush_deferred_io(struct mapped_device *md)
+{
+	struct deferred_io *c, *n;
+
+	for (c = md->deferred, md->deferred = 0; c; c = n) {
+		n = c->next;
+		generic_make_request(c->rw, c->bh);
+		free_deferred(c);
+	}
+}
+
+/*
+ * make the device available for use, if was
+ * previously suspended rather than newly created
+ * then all queued io is flushed
+ */
+int dm_activate(struct mapped_device *md, struct dm_table *table)
+{
+	int r;
+
+	/* check that the mapping has at least been loaded. */
+	if (!table->num_targets)
+		return -EINVAL;
+
+	wl;
+
+	/* you must be deactivated first */
+	if (is_active(md)) {
+		wu;
+		return -EPERM;
+	}
+
+	__bind(md, table);
+
+	if ((r = open_devices(&md->map->devices))) {
+		wu;
+		return r;
+	}
+
+	set_bit(DM_ACTIVE, &md->state);
+	__flush_deferred_io(md);
+	wu;
+
+	return 0;
+}
+
+/*
+ * Deactivate the device, the device must not be
+ * opened by anyone.
+ */
+int dm_deactivate(struct mapped_device *md)
+{
+	rl;
+	if (md->use_count) {
+		ru;
+		return -EPERM;
+	}
+
+	fsync_dev(md->dev);
+
+	ru;
+
+	wl;
+	if (md->use_count) {
+		/* drat, somebody got in quick ... */
+		wu;
+		return -EPERM;
+	}
+
+	if (md->map)
+		close_devices(&md->map->devices);
+	md->map = NULL;
+	clear_bit(DM_ACTIVE, &md->state);
+	wu;
+
+	return 0;
+}
+
+/*
+ * We need to be able to change a mapping table
+ * under a mounted filesystem.  for example we
+ * might want to move some data in the background.
+ * Before the table can be swapped with
+ * dm_bind_table, dm_suspend must be called to
+ * flush any in flight buffer_heads and ensure
+ * that any further io gets deferred.
+ */
+void dm_suspend(struct mapped_device *md)
+{
+	DECLARE_WAITQUEUE(wait, current);
+
+	wl;
+	if (!is_active(md)) {
+		wu;
+		return;
+	}
+
+	clear_bit(DM_ACTIVE, &md->state);
+	wu;
+
+	/* wait for all the pending io to flush */
+	add_wait_queue(&md->wait, &wait);
+	current->state = TASK_UNINTERRUPTIBLE;
+	do {
+		wl;
+		if (!atomic_read(&md->pending))
+			break;
+
+		wu;
+		schedule();
+
+	} while (1);
+
+	current->state = TASK_RUNNING;
+	remove_wait_queue(&md->wait, &wait);
+	close_devices(&md->map->devices);
+
+	md->map = 0;
+	wu;
+}
+
+struct block_device_operations dm_blk_dops = {
+	open:	  dm_blk_open,
+	release:  dm_blk_close,
+	ioctl:	  dm_blk_ioctl,
+	owner:    THIS_MODULE,
+};
+
+/*
+ * module hooks
+ */
+module_init(dm_init);
+module_exit(dm_exit);
+
+MODULE_PARM(major, "i");
+MODULE_PARM_DESC(major, "The major device number of the device-mapper");
+MODULE_DESCRIPTION("device-mapper driver");
+MODULE_AUTHOR("Joe Thornber <thornber@btconnect.com>");
+MODULE_LICENSE("GPL");
+
+/*
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */

driver/device-mapper/dm.h

@@ -0,0 +1,256 @@
+/*
+ * dm.h
+ *
+ * Copyright (C) 2001 Sistina Software
+ *
+ * This file is released under the GPL.
+ */
+
+/*
+ * Internal header file for device mapper
+ *
+ * Changelog
+ *
+ *     16/08/2001 - First version [Joe Thornber]
+ */
+
+/*
+ * This driver attempts to provide a generic way of specifying logical
+ * devices which are mapped onto other devices.
+ *
+ * It does this by mapping sections of the logical device onto 'targets'.
+ *
+ * When the logical device is accessed the make_request function looks up
+ * the correct target for the given sector, and then asks this target
+ * to do the remapping.
+ *
+ * (dm-table.c) A btree like structure is used to hold the sector
+ * range -> target mapping.  Because we know all the entries in the
+ * btree in advance we can make a very compact tree, omitting pointers
+ * to child nodes, (child nodes locations can be calculated). Each
+ * node of the btree is 1 level cache line in size, this gives a small
+ * performance boost.
+ *
+ * A userland test program for the btree gave the following results on a
+ * 1 Gigahertz Athlon machine:
+ *
+ * entries in btree               lookups per second
+ * ----------------               ------------------
+ * 5                              25,000,000
+ * 1000                           7,700,000
+ * 10,000,000                     3,800,000
+ *
+ * Of course these results should be taken with a pinch of salt; the
+ * lookups were sequential and there were no other applications (other
+ * than X + emacs) running to give any pressure on the level 1 cache.
+ *
+ * Typical LVM users would find they have very few targets for each
+ * LV (probably less than 10).
+ *
+ * (dm-target.c) Target types are not hard coded, instead the
+ * register_mapping_type function should be called.  A target type is
+ * specified using three functions (see the header):
+ *
+ * dm_ctr_fn - takes a string and contructs a target specific piece of
+ *             context data.
+ * dm_dtr_fn - destroy contexts.
+ * dm_map_fn - function that takes a buffer_head and some previously
+ *             constructed context and performs the remapping.
+ *
+ * Currently there are two two trivial mappers, which are
+ * automatically registered: 'linear', and 'io_error'.  Linear alone
+ * is enough to implement most LVM features (omitting striped volumes
+ * and snapshots).
+ *
+ * (dm-fs.c) The driver is controlled through a /proc interface:
+ * /proc/device-mapper/control allows you to create and remove devices
+ * by 'cat'ing a line of the following format:
+ *
+ * create <device name> [minor no]
+ * remove <device name>
+ *
+ * /proc/device-mapper/<device name> accepts the mapping table:
+ *
+ * begin
+ * <sector start> <length> <target name> <target args>...
+ * ...
+ * end
+ *
+ * The begin/end lines are nasty, they should be handled by open/close
+ * for the file.
+ *
+ * At the moment the table assumes 32 bit keys (sectors), the move to
+ * 64 bits will involve no interface changes, since the tables will be
+ * read in as ascii data.  A different table implementation can
+ * therefor be provided at another time.  Either just by changing offset_t
+ * to 64 bits, or maybe implementing a structure which looks up the keys in
+ * stages (ie, 32 bits at a time).
+ *
+ * More interesting targets:
+ *
+ * striped mapping; given a stripe size and a number of device regions
+ * this would stripe data across the regions.  Especially useful, since
+ * we could limit each striped region to a 32 bit area and then avoid
+ * nasty 64 bit %'s.
+ *
+ * mirror mapping (reflector ?); would set off a kernel thread slowly
+ * copying data from one region to another, ensuring that any new
+ * writes got copied to both destinations correctly.  Great for
+ * implementing pvmove.  Not sure how userland would be notified that
+ * the copying process had completed.  Possibly by reading a /proc entry
+ * for the LV.  Could also use poll() for this kind of thing.
+ */
+
+
+#ifndef DM_INTERNAL_H
+#define DM_INTERNAL_H
+
+#include <linux/version.h>
+#include <linux/major.h>
+#include <linux/iobuf.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/compatmac.h>
+#include <linux/cache.h>
+#include <linux/devfs_fs_kernel.h>
+#include <linux/ctype.h>
+#include <linux/device-mapper.h>
+#include <linux/list.h>
+
+#define MAX_DEPTH 16
+#define NODE_SIZE L1_CACHE_BYTES
+#define KEYS_PER_NODE (NODE_SIZE / sizeof(offset_t))
+#define CHILDREN_PER_NODE (KEYS_PER_NODE + 1)
+#define DM_NAME_LEN 128
+#define MAX_TARGET_LINE 256
+
+enum {
+	DM_BOUND = 0,		/* device has been bound to a table */
+	DM_ACTIVE,		/* device is running */
+};
+
+
+/*
+ * list of devices that a metadevice uses
+ * and hence should open/close.
+ */
+struct dm_dev {
+	atomic_t count;
+	struct list_head list;
+
+	kdev_t dev;
+	struct block_device *bd;
+};
+
+/*
+ * io that had to be deferred while we were
+ * suspended
+ */
+struct deferred_io {
+	int rw;
+	struct buffer_head *bh;
+	struct deferred_io *next;
+};
+
+/*
+ * btree leaf, these do the actual mapping
+ */
+struct target {
+	struct target_type *type;
+	void *private;
+};
+
+/*
+ * the btree
+ */
+struct dm_table {
+	/* btree table */
+	int depth;
+	int counts[MAX_DEPTH];	/* in nodes */
+	offset_t *index[MAX_DEPTH];
+
+	int num_targets;
+	int num_allocated;
+	offset_t *highs;
+	struct target *targets;
+
+	/* a list of devices used by this table */
+	struct list_head devices;
+};
+
+/*
+ * the actual device struct
+ */
+struct mapped_device {
+	kdev_t dev;
+	char name[DM_NAME_LEN];
+
+	int use_count;
+	int state;
+
+	/* a list of io's that arrived while we were suspended */
+	atomic_t pending;
+	wait_queue_head_t wait;
+	struct deferred_io *deferred;
+
+	struct dm_table *map;
+
+	/* used by dm-fs.c */
+	devfs_handle_t devfs_entry;
+};
+
+extern struct block_device_operations dm_blk_dops;
+
+
+/* dm-target.c */
+int dm_target_init(void);
+struct target_type *dm_get_target_type(const char *name);
+void dm_put_target_type(struct target_type *t);
+
+/* dm.c */
+struct mapped_device *dm_find_by_minor(int minor);
+
+struct mapped_device *dm_create(const char *name, int minor);
+int dm_remove(struct mapped_device *md);
+
+int dm_activate(struct mapped_device *md, struct dm_table *t);
+int dm_deactivate(struct mapped_device *md);
+
+void dm_suspend(struct mapped_device *md);
+
+
+/* dm-table.c */
+struct dm_table *dm_table_create(void);
+void dm_table_destroy(struct dm_table *t);
+
+int dm_table_add_target(struct dm_table *t, offset_t high,
+			struct target_type *type, void *private);
+int dm_table_complete(struct dm_table *t);
+
+#define WARN(f, x...) printk(KERN_WARNING "device-mapper: " f "\n" , ## x)
+
+/*
+ * calculate the index of the child node of the
+ * n'th node k'th key.
+ */
+static inline int get_child(int n, int k)
+{
+	return (n * CHILDREN_PER_NODE) + k;
+}
+
+/*
+ * returns the n'th node of level l from table t.
+ */
+static inline offset_t *get_node(struct dm_table *t, int l, int n)
+{
+	return t->index[l] + (n * KEYS_PER_NODE);
+}
+
+static inline int is_active(struct mapped_device *md)
+{
+	return test_bit(DM_ACTIVE, &md->state);
+}
+
+#endif

driver/device-mapper/dmfs-error.c

@@ -0,0 +1,154 @@
+/*
+ * dmfs-error.c
+ *
+ * Copyright (C) 2001 Sistina Software
+ *
+ * This software 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, or (at
+ * your option) any later version.
+ *
+ * This software 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 GNU CC; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/config.h>
+#include <linux/list.h>
+#include <linux/fs.h>
+#include <linux/seq_file.h>
+
+#include "dm.h"
+#include "dmfs.h"
+
+struct dmfs_error {
+	struct list_head list;
+	unsigned len;
+	char *msg;
+};
+
+static struct dmfs_error oom_error;
+
+static struct list_head oom_list = {
+	next: &oom_error.list,
+	prev: &oom_error.list,
+};
+
+static struct dmfs_error oom_error = {
+	list: { next: &oom_list, prev: &oom_list },
+	len: 39,
+	msg: "Out of memory during creation of table\n",
+};
+
+void dmfs_add_error(struct inode *inode, unsigned num, char *str)
+{
+	struct dmfs_i *dmi = DMFS_I(inode);
+	int len = strlen(str) + sizeof(struct dmfs_error) + 12;
+	struct dmfs_error *e = kmalloc(len, GFP_KERNEL);
+	if (e) {
+		e->msg = (char *)(e + 1);
+		e->len = sprintf(e->msg, "%8u: %s\n", num, str);
+		list_add(&e->list, &dmi->errors);
+	}
+}
+
+void dmfs_zap_errors(struct inode *inode)
+{
+	struct dmfs_i *dmi = DMFS_I(inode);
+	struct dmfs_error *e;
+
+	while(!list_empty(&dmi->errors)) {
+		e = list_entry(dmi->errors.next, struct dmfs_error, list);
+		list_del(&e->list);
+		kfree(e);
+	}
+}
+
+static void *e_start(void *context, loff_t *pos)
+{
+	struct list_head *p;
+	loff_t n = *pos;
+	struct dmfs_i *dmi = context;
+
+	down(&dmi->sem);
+	if (dmi->status) {
+		list_for_each(p, &oom_list)
+			if (n-- == 0)
+				return list_entry(p, struct dmfs_error, list);
+	} else {
+		list_for_each(p, &dmi->errors)
+			if (n-- == 0)
+				return list_entry(p, struct dmfs_error, list);
+	}
+
+	return NULL;
+}
+
+static void *e_next(void *context, void *v, loff_t *pos)
+{
+	struct dmfs_i *dmi = context;
+	struct list_head *p = ((struct dmfs_error *)v)->list.next;
+	(*pos)++;
+	return (p == &dmi->errors) || (p == &oom_list) ? NULL 
+				   : list_entry(p, struct dmfs_error, list);
+}
+
+static void e_stop(void *context, void *v)
+{
+	struct dmfs_i *dmi = context;
+	up(&dmi->sem);
+}
+
+static int show_error(struct seq_file *e, void *v)
+{
+	struct dmfs_error *d = v;
+	seq_puts(e, d->msg);
+	return 0;
+}
+
+static struct seq_operations error_op = {
+	start: e_start,
+	next: e_next,
+	stop: e_stop,
+	show: show_error,
+};
+
+static int dmfs_error_open(struct inode *inode, struct file *file)
+{
+	return seq_open(file, &error_op, DMFS_I(file->f_dentry->d_parent->d_inode));
+}
+
+static int dmfs_error_sync(struct file *file, struct dentry *dentry, int datasync)
+{
+	return 0;
+}
+
+static struct file_operations dmfs_error_file_operations = {
+	open:		dmfs_error_open,
+	read:		seq_read,
+	llseek:		seq_lseek,
+	release:	seq_release,
+	fsync:		dmfs_error_sync,
+};
+
+static struct inode_operations dmfs_error_inode_operations = {
+};
+
+struct inode *dmfs_create_error(struct inode *dir, int mode)
+{
+	struct inode *inode = dmfs_new_inode(dir->i_sb, mode | S_IFREG);
+
+	if (inode) {
+		inode->i_fop = &dmfs_error_file_operations;
+		inode->i_op = &dmfs_error_inode_operations;
+	}
+
+	return inode;
+}
+

driver/device-mapper/dmfs-lv.c

@@ -0,0 +1,286 @@
+/*
+ * dmfs-lv.c
+ *
+ * Copyright (C) 2001 Sistina Software
+ *
+ * This software 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, or (at
+ * your option) any later version.
+ *
+ * This software 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 GNU CC; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* Heavily based upon ramfs */
+
+#include <linux/config.h>
+#include <linux/ctype.h>
+#include <linux/fs.h>
+
+#include "dm.h"
+#include "dmfs.h"
+
+extern struct address_space_operations dmfs_address_space_operations;
+extern struct inode *dmfs_create_tdir(struct super_block *sb, int mode);
+
+struct dentry *dmfs_verify_name(struct inode *dir, const char *name)
+{
+	struct nameidata nd;
+	int err = -ENOENT;
+	struct file file;
+	struct dentry *dentry;
+
+	memset(&file, 0, sizeof(struct file));
+
+	if (!path_init(name, LOOKUP_FOLLOW, &nd))
+		return ERR_PTR(-EINVAL);
+
+	err = path_walk(name, &nd);
+	if (err)
+		goto err_out;
+
+	err = -EINVAL;
+	if (nd.mnt->mnt_sb != dir->i_sb)
+		goto err_out;
+
+	if (nd.dentry->d_parent->d_inode != dir)
+		goto err_out;
+
+	err = -ENODATA;
+	if (DMFS_I(nd.dentry->d_inode) == NULL || 
+	    DMFS_I(nd.dentry->d_inode)->table == NULL)
+		goto err_out;
+
+	if (!list_empty(&(DMFS_I(nd.dentry->d_inode)->errors)))
+		goto err_out;
+
+	dentry = nd.dentry;
+	file.f_dentry = nd.dentry;
+	err = deny_write_access(&file);
+	if (err)
+		goto err_out;
+
+	dget(dentry);
+	path_release(&nd);
+	return dentry;
+err_out:
+	path_release(&nd);
+	return ERR_PTR(err);
+}
+
+struct inode *dmfs_create_symlink(struct inode *dir, int mode)
+{
+	struct inode *inode = dmfs_new_private_inode(dir->i_sb, mode | S_IFLNK);
+
+	if (inode) {
+		inode->i_mapping->a_ops = &dmfs_address_space_operations;
+		inode->i_op = &page_symlink_inode_operations;
+	}
+
+	return inode;
+}
+
+static int dmfs_lv_unlink(struct inode *dir, struct dentry *dentry)
+{
+	struct inode *inode = dentry->d_inode;
+	struct file file = { f_dentry: DMFS_I(inode)->dentry };
+
+	if (!(inode->i_mode & S_IFLNK))
+		return -EINVAL;
+
+	dm_suspend(DMFS_I(dir)->md);
+	allow_write_access(&file);
+	dput(DMFS_I(inode)->dentry);
+	DMFS_I(inode)->dentry = NULL;
+	inode->i_nlink--;
+	dput(dentry);
+	return 0;
+}
+
+static int dmfs_lv_symlink(struct inode *dir, struct dentry *dentry, 
+			   const char *symname)
+{
+	struct inode *inode;
+	struct dentry *de;
+	int rv;
+	int l;
+
+	if (dentry->d_name.len != 6 || 
+	    memcmp(dentry->d_name.name, "ACTIVE", 6) != 0)
+		return -EINVAL;
+
+	de = dmfs_verify_name(dir, symname);
+	if (IS_ERR(de))
+		return PTR_ERR(de);
+
+	inode = dmfs_create_symlink(dir, S_IRWXUGO);
+	if (inode == NULL) {
+		rv = -ENOSPC;
+		goto out_allow_write;
+	}
+
+	DMFS_I(inode)->dentry = de;
+	d_instantiate(dentry, inode);
+	dget(dentry);
+
+	l = strlen(symname) + 1;
+	rv = block_symlink(inode, symname, l);
+	if (rv)
+		goto out_dput;
+
+	rv = dm_activate(DMFS_I(dir)->md, DMFS_I(de->d_inode)->table);
+	if (rv)
+		goto out_dput;
+
+	return rv;
+
+out_dput:
+	dput(dentry);
+	DMFS_I(inode)->dentry = NULL;
+out_allow_write:
+	{
+		struct file file = { f_dentry: de };
+		allow_write_access(&file);
+		dput(de);
+	}
+	return rv;
+}
+
+static int is_identifier(const char *str, int len)
+{
+	while(len--) {
+		if (!isalnum(*str) && *str != '_')
+			return 0;
+		str++;
+	}
+	return 1;
+}
+
+static int dmfs_lv_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+{
+	struct inode *inode;
+	int rv = -ENOSPC;
+
+	if (dentry->d_name.len >= DM_NAME_LEN)
+		return -EINVAL;
+
+	if (!is_identifier(dentry->d_name.name, dentry->d_name.len))
+		return -EPERM;
+
+	if (dentry->d_name.len == 6 && 
+	    memcmp(dentry->d_name.name, "ACTIVE", 6) == 0)
+		return -EINVAL;
+
+	if (dentry->d_name.name[0] == '.')
+		return -EINVAL;
+
+	inode = dmfs_create_tdir(dir->i_sb, mode);
+	if (inode) {
+		d_instantiate(dentry, inode);
+		dget(dentry);
+		rv = 0;
+	}
+	return rv;
+}
+
+/*
+ * if u.generic_ip is not NULL, then it indicates an inode which
+ * represents a table. If it is NULL then the inode is a virtual
+ * file and should be deleted along with the directory.
+ */
+static inline int positive(struct dentry *dentry)
+{
+	return dentry->d_inode && !d_unhashed(dentry);
+}
+
+static int empty(struct dentry *dentry)
+{
+	struct list_head *list;
+
+	spin_lock(&dcache_lock);
+	list = dentry->d_subdirs.next;
+
+	while(list != &dentry->d_subdirs) {
+		struct dentry *de = list_entry(list, struct dentry, d_child);
+
+		if (positive(de)) {
+			spin_unlock(&dcache_lock);
+			return 0;
+		}
+		list = list->next;
+	}
+	spin_unlock(&dcache_lock);
+	return 1;
+}
+
+static int dmfs_lv_rmdir(struct inode *dir, struct dentry *dentry)
+{
+	int ret = -ENOTEMPTY;
+
+	if (empty(dentry)) {
+		struct inode *inode = dentry->d_inode;
+		inode->i_nlink--;
+		dput(dentry);
+		ret = 0;
+	}
+
+	return ret;
+}
+
+static struct dentry *dmfs_lv_lookup(struct inode *dir, struct dentry *dentry)
+{
+	d_add(dentry, NULL);
+	return NULL;
+}
+
+static int dmfs_lv_sync(struct file *file, struct dentry *dentry, int datasync)
+{
+	return 0;
+}
+
+static struct file_operations dmfs_lv_file_operations = {
+	read:		generic_read_dir,
+	readdir:	dcache_readdir,
+	fsync:		dmfs_lv_sync,
+};
+
+static struct inode_operations dmfs_lv_inode_operations = {
+	lookup:		dmfs_lv_lookup,
+	unlink:		dmfs_lv_unlink,
+	symlink:	dmfs_lv_symlink,
+	mkdir:		dmfs_lv_mkdir,
+	rmdir:		dmfs_lv_rmdir,
+};
+
+struct inode *dmfs_create_lv(struct super_block *sb, int mode, struct dentry *dentry)
+{
+	struct inode *inode = dmfs_new_private_inode(sb, mode | S_IFDIR);
+	struct mapped_device *md;
+	const char *name = dentry->d_name.name;
+	char tmp_name[DM_NAME_LEN + 1];
+
+	if (inode) {
+		inode->i_fop = &dmfs_lv_file_operations;
+		inode->i_op = &dmfs_lv_inode_operations;
+		memcpy(tmp_name, name, dentry->d_name.len);
+		tmp_name[dentry->d_name.len] = 0;
+		md = dm_create(tmp_name, -1);
+		if (IS_ERR(md)) {
+			iput(inode);
+			return ERR_PTR(PTR_ERR(md));
+		}
+		DMFS_I(inode)->md = md;
+	}
+
+	return inode;
+}
+
+

driver/device-mapper/dmfs-root.c

@@ -0,0 +1,158 @@
+/*
+ * dmfs-root.c
+ *
+ * Copyright (C) 2001 Sistina Software
+ *
+ * This software 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, or (at
+ * your option) any later version.
+ *
+ * This software 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 GNU CC; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* Heavily based upon ramfs */
+
+#include <linux/config.h>
+#include <linux/ctype.h>
+#include <linux/fs.h>
+
+#include "dm.h"
+#include "dmfs.h"
+
+extern struct inode *dmfs_create_lv(struct super_block *sb, int mode, struct dentry *dentry);
+
+static int is_identifier(const char *str, int len)
+{
+	while(len--) {
+		if (!isalnum(*str) && *str != '_')
+			return 0;
+		str++;
+	}
+	return 1;
+}
+
+static int dmfs_root_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+{
+	struct inode *inode;
+	int rv = -ENOSPC;
+
+	if (dentry->d_name.len >= DM_NAME_LEN)
+		return -EINVAL;
+
+	if (!is_identifier(dentry->d_name.name, dentry->d_name.len))
+		return -EPERM;
+
+	if (dentry->d_name.name[0] == '.')
+		return -EINVAL;
+
+	inode = dmfs_create_lv(dir->i_sb, mode, dentry);
+	if (inode) {
+		d_instantiate(dentry, inode);
+		dget(dentry);
+		rv = 0;
+	}
+	return rv;
+}
+
+/*
+ * if u.generic_ip is not NULL, then it indicates an inode which
+ * represents a table. If it is NULL then the inode is a virtual
+ * file and should be deleted along with the directory.
+ */
+static inline int positive(struct dentry *dentry)
+{
+	return dentry->d_inode && !d_unhashed(dentry);
+}
+
+static int empty(struct dentry *dentry)
+{
+	struct list_head *list;
+
+	spin_lock(&dcache_lock);
+	list = dentry->d_subdirs.next;
+
+	while(list != &dentry->d_subdirs) {
+		struct dentry *de = list_entry(list, struct dentry, d_child);
+
+		if (positive(de)) {
+			spin_unlock(&dcache_lock);
+			return 0;
+		}
+		list = list->next;
+	}
+	spin_unlock(&dcache_lock);
+	return 1;
+}
+
+static int dmfs_root_rmdir(struct inode *dir, struct dentry *dentry)
+{
+	int ret = -ENOTEMPTY;
+
+	if (empty(dentry)) {
+		struct inode *inode = dentry->d_inode;
+		ret = dm_deactivate(DMFS_I(inode)->md);
+		if (ret == 0) {
+			inode->i_nlink--;
+			dput(dentry);
+		}
+	}
+
+	return ret;
+}
+
+static struct dentry *dmfs_root_lookup(struct inode *dir, struct dentry *dentry)
+{
+	d_add(dentry, NULL);
+	return NULL;
+}
+
+static int dmfs_root_rename(struct inode *old_dir, struct dentry *old_dentry,
+			struct inode *new_dir, struct dentry *new_dentry)
+{
+	/* Can only rename - not move between directories! */
+	if (old_dir != new_dir)
+		return -EPERM;
+
+	return -EINVAL; /* FIXME: a change of LV name here */
+}
+
+static int dmfs_root_sync(struct file *file, struct dentry *dentry, int datasync)
+{
+	return 0;
+}
+
+static struct file_operations dmfs_root_file_operations = {
+	read:		generic_read_dir,
+	readdir:	dcache_readdir,
+	fsync:		dmfs_root_sync,
+};
+
+static struct inode_operations dmfs_root_inode_operations = {
+	lookup:		dmfs_root_lookup,
+	mkdir:		dmfs_root_mkdir,
+	rmdir:		dmfs_root_rmdir,
+	rename:		dmfs_root_rename,
+};
+
+struct inode *dmfs_create_root(struct super_block *sb, int mode)
+{
+	struct inode *inode = dmfs_new_inode(sb, mode | S_IFDIR);
+
+	if (inode) {
+		inode->i_fop = &dmfs_root_file_operations;
+		inode->i_op = &dmfs_root_inode_operations;
+	}
+
+	return inode;
+}
+
+

driver/device-mapper/dmfs-status.c

@@ -0,0 +1,57 @@
+/*
+ * dmfs-status.c
+ *
+ * Copyright (C) 2001 Sistina Software
+ *
+ * This software 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, or (at
+ * your option) any later version.
+ *
+ * This software 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 GNU CC; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/config.h>
+#include <linux/fs.h>
+
+#include "dm.h"
+#include "dmfs.h"
+
+static ssize_t dmfs_status_read(struct file *file, char *buf, size_t size, loff_t *pos)
+{
+	return 0;
+}
+
+static int dmfs_status_sync(struct file *file, struct dentry *dentry, int datasync)
+{
+	return 0;
+}
+
+static struct file_operations dmfs_status_file_operations = {
+	read:		dmfs_status_read,
+	fsync:		dmfs_status_sync,
+};
+
+static struct inode_operations dmfs_status_inode_operations = {
+};
+
+struct inode *dmfs_create_status(struct inode *dir, int mode)
+{
+	struct inode *inode = dmfs_new_inode(dir->i_sb, mode | S_IFREG);
+
+	if (inode) {
+		inode->i_fop = &dmfs_status_file_operations;
+		inode->i_op = &dmfs_status_inode_operations;
+	}
+
+	return inode;
+}
+

driver/device-mapper/dmfs-super.c

@@ -0,0 +1,162 @@
+/*
+ * dmfs-super.c
+ *
+ * Copyright (C) 2001 Sistina Software
+ *
+ * This software 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, or (at
+ * your option) any later version.
+ *
+ * This software 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 GNU CC; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/config.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+
+#include "dmfs.h"
+#include "dm.h"
+
+#define DMFS_MAGIC 0x444D4653
+
+extern struct inode *dmfs_create_root(struct super_block *sb, int);
+
+static int dmfs_statfs(struct super_block *sb, struct statfs *buf)
+{
+	buf->f_type = sb->s_magic;
+	buf->f_bsize = sb->s_blocksize;
+	buf->f_namelen = DM_NAME_LEN - 1;
+
+	return 0;
+}
+
+static void dmfs_delete_inode(struct inode *inode)
+{
+	struct dmfs_i *dmi = DMFS_I(inode);
+
+	if (dmi) {
+		if (dmi->md)
+			dm_remove(dmi->md);
+		if (dmi->table)
+			dm_table_destroy(dmi->table);
+		if (dmi->dentry)
+			dput(dmi->dentry);
+		if (!list_empty(&dmi->errors))
+			dmfs_zap_errors(inode);
+		kfree(dmi);
+		MOD_DEC_USE_COUNT; /* Don't remove */
+	}
+
+	inode->u.generic_ip = NULL;
+	clear_inode(inode);
+}
+
+static struct super_operations dmfs_super_operations = {
+	statfs:		dmfs_statfs,
+	put_inode:	force_delete,
+	delete_inode:	dmfs_delete_inode,
+};
+
+static struct super_block *dmfs_read_super(struct super_block *sb, void *data, int silent)
+{
+	struct inode *inode;
+	struct dentry *root;
+
+	sb->s_blocksize = PAGE_CACHE_SIZE;
+	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
+	sb->s_magic = DMFS_MAGIC;
+	sb->s_op = &dmfs_super_operations;
+	sb->s_maxbytes = MAX_NON_LFS;
+
+	inode = dmfs_create_root(sb, 0755);
+	if (IS_ERR(inode))
+		return NULL;
+	root = d_alloc_root(inode);
+	if (!root) {
+		iput(inode);
+		return NULL;
+	}
+	sb->s_root = root;
+
+	return sb;
+}
+
+struct inode *dmfs_new_inode(struct super_block *sb, int mode)
+{
+	struct inode *inode = new_inode(sb);
+
+	if (inode) {
+		inode->i_mode = mode;
+		inode->i_uid = current->fsuid;
+		inode->i_gid = current->fsgid;
+		inode->i_blksize = PAGE_CACHE_SIZE;
+		inode->i_blocks = 0;
+		inode->i_rdev = NODEV;
+		inode->i_atime = inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+	}
+
+	return inode;
+}
+
+struct inode *dmfs_new_private_inode(struct super_block *sb, int mode)
+{
+	struct inode *inode = dmfs_new_inode(sb, mode);
+	struct dmfs_i *dmi;
+
+	if (inode) {
+		dmi = kmalloc(sizeof(struct dmfs_i), GFP_KERNEL);
+		if (dmi == NULL) {
+			iput(inode);
+			return NULL;
+		}
+		memset(dmi, 0, sizeof(struct dmfs_i));
+		init_MUTEX(&dmi->sem);
+		INIT_LIST_HEAD(&dmi->errors);
+		inode->u.generic_ip = dmi;
+		MOD_INC_USE_COUNT; /* Don't remove */
+	}
+	return inode;
+}
+
+static DECLARE_FSTYPE(dmfs_fstype, "dmfs", dmfs_read_super, FS_SINGLE);
+static struct vfsmount *dmfs_mnt;
+
+int __init dmfs_init(void)
+{
+	int ret;
+
+	ret = register_filesystem(&dmfs_fstype);
+	if (ret < 0)
+		goto out;
+
+	dmfs_mnt = kern_mount(&dmfs_fstype);
+	if (IS_ERR(dmfs_mnt)) {
+		ret = PTR_ERR(dmfs_mnt);
+		unregister_filesystem(&dmfs_fstype);
+	} else {
+		MOD_DEC_USE_COUNT; /* Yes, this really is correct... */
+	}
+out:
+	return ret;
+}
+
+int __exit dmfs_exit(void)
+{
+	MOD_INC_USE_COUNT; /* So that it lands up being zero */
+
+	do_umount(dmfs_mnt, 0);
+
+	unregister_filesystem(&dmfs_fstype);
+
+	return 0;
+}
+

driver/device-mapper/dmfs-table.c

@@ -0,0 +1,353 @@
+/*
+ * dmfs-table.c
+ *
+ * Copyright (C) 2001 Sistina Software
+ *
+ * This software 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, or (at
+ * your option) any later version.
+ *
+ * This software 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 GNU CC; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/config.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
+
+#include "dm.h"
+#include "dmfs.h"
+
+static offset_t start_of_next_range(struct dm_table *t)
+{
+	offset_t n = 0;
+	if (t->num_targets) {
+		n = t->highs[t->num_targets - 1] + 1;
+	}
+	return n;
+}
+
+static char *dmfs_parse_line(struct dm_table *t, char *str)
+{
+	offset_t start, size, high;
+	void *context;
+	struct target_type *ttype;
+	int rv = 0;
+	char *msg;
+	int pos = 0;
+	char target[33];
+
+static char *err_table[] = {
+	"Missing/Invalid start argument",
+	"Missing/Invalid size argument",
+	"Missing target type"
+};
+	printk("dmfs_parse_line: (%s)\n", str);
+
+	rv = sscanf(str, "%d %d %32s%n", &start, &size, target, &pos);
+	if (rv < 3) {
+		msg = err_table[rv];
+		goto out;
+	}
+	str += pos;
+	while(*str && isspace(*str))
+		str++;
+
+	msg = "Gap in table";
+	if (start != start_of_next_range(t))
+		goto out;
+
+	msg = "Target type unknown";
+	ttype = dm_get_target_type(target);
+	if (ttype) {
+		msg = "This message should never appear (constructor error)";
+		rv = ttype->ctr(t, start, size, str, &context);
+		msg = context;
+		if (rv == 0) {
+			printk("dmfs_parse: %u %u %s %s\n", start, size, 
+				ttype->name,
+				ttype->print ? ttype->print(context) : "-");
+			msg = "Error adding target to table";
+			high = start + (size - 1);
+			if (dm_table_add_target(t, high, ttype, context) == 0)
+				return NULL;
+			ttype->dtr(t, context);
+		}
+		dm_put_target_type(ttype);
+	}
+out:
+	return msg;
+}
+
+
+static int dmfs_copy(char *dst, int dstlen, char *src, int srclen, int *flag)
+{
+	int len = min(dstlen, srclen);
+	char *start = dst;
+
+	while(len) {
+		*dst = *src++;
+		if (*dst == '\n')
+			goto end_of_line;
+		dst++;
+		len--;
+	}
+out:
+	return (dst - start);
+end_of_line:
+	dst++;
+	*flag = 1;
+	goto out;
+}
+
+static int dmfs_line_is_not_comment(char *str)
+{
+	while(*str) {
+		if (*str == '#')
+			break;
+		if (!isspace(*str))
+			return 1;
+		str++;
+	}
+	return 0;
+}
+
+struct dmfs_desc {
+	struct dm_table *table;
+	struct inode *inode;
+	char *tmp;
+	loff_t tmpl;
+	unsigned long lnum;
+};
+
+static int dmfs_read_actor(read_descriptor_t *desc, struct page *page, unsigned long offset, unsigned long size)
+{
+	char *buf, *msg;
+	unsigned long count = desc->count, len, copied;
+	struct dmfs_desc *d = (struct dmfs_desc *)desc->buf;
+	
+	if (size > count)
+		size = count;
+
+	len = size;
+	buf = kmap(page);
+	do { 
+		int flag = 0;
+		copied = dmfs_copy(d->tmp + d->tmpl, PAGE_SIZE - d->tmpl - 1,
+				   buf + offset, len, &flag);
+		offset += copied;
+		len -= copied;
+		if (d->tmpl + copied == PAGE_SIZE - 1)
+			goto line_too_long;
+		d->tmpl += copied;
+		if (flag || (len == 0 && count == size)) {
+			*(d->tmp + d->tmpl) = 0;
+			if (dmfs_line_is_not_comment(d->tmp)) {
+				msg = dmfs_parse_line(d->table, d->tmp);
+				if (msg) {
+					dmfs_add_error(d->inode, d->lnum, msg);
+				}
+			}
+			d->lnum++;
+			d->tmpl = 0;
+		}
+	} while(len > 0);
+	kunmap(page);
+
+	desc->count = count - size;
+	desc->written += size;
+
+	return size;
+
+line_too_long:
+	printk(KERN_INFO "dmfs_read_actor: Line %lu too long\n", d->lnum);
+	kunmap(page);
+	return 0;
+}
+
+static struct dm_table *dmfs_parse(struct inode *inode, struct file *filp)
+{
+	struct dm_table *t = NULL;
+	unsigned long page;
+	struct dmfs_desc d;
+	loff_t pos = 0;
+
+	if (inode->i_size == 0)
+		return NULL;
+
+	page = __get_free_page(GFP_NOFS);
+	if (page) {
+		t = dm_table_create();
+		if (t) {
+			read_descriptor_t desc;
+
+			desc.written = 0;
+			desc.count = inode->i_size;
+			desc.buf = (char *)&d;
+			d.table = t;
+			d.inode = inode;
+			d.tmp = (char *)page;
+			d.tmpl = 0;
+			d.lnum = 1;
+
+			do_generic_file_read(filp, &pos, &desc, dmfs_read_actor);
+			if (desc.written != inode->i_size) {
+				dm_table_destroy(t);
+				t = NULL;
+			}
+		}
+		free_page(page);
+	}
+	return t;
+}
+
+static int dmfs_table_release(struct inode *inode, struct file *f)
+{
+	struct dentry *dentry = f->f_dentry;
+	struct inode *parent = dentry->d_parent->d_inode;
+	struct dmfs_i *dmi = DMFS_I(parent);
+	struct dm_table *table;
+
+	if (f->f_mode & FMODE_WRITE) {
+
+		down(&dmi->sem);
+		dmfs_zap_errors(dentry->d_parent->d_inode);
+		table = dmfs_parse(dentry->d_parent->d_inode, f);
+
+		if (table) {
+			if (dmi->table)
+				dm_table_destroy(dmi->table);
+			dmi->table = table;
+		}
+		up(&dmi->sem);
+
+                put_write_access(parent);
+	}
+
+	return 0;
+}
+
+static int dmfs_readpage(struct file *file, struct page *page)
+{
+	if (!Page_Uptodate(page)) {
+		memset(kmap(page), 0, PAGE_CACHE_SIZE);
+		kunmap(page);
+		flush_dcache_page(page);
+		SetPageUptodate(page);
+	}
+	UnlockPage(page);
+	return 0;
+}
+
+static int dmfs_prepare_write(struct file *file, struct page *page,
+			      unsigned offset, unsigned to)
+{
+	void *addr = kmap(page);
+	if (!Page_Uptodate(page)) {
+		memset(addr, 0, PAGE_CACHE_SIZE);
+		flush_dcache_page(page);
+		SetPageUptodate(page);
+	}
+	SetPageDirty(page);
+	return 0;
+}
+
+static int dmfs_commit_write(struct file *file, struct page *page,
+			     unsigned offset, unsigned to)
+{
+	struct inode *inode = page->mapping->host;
+	loff_t pos = ((loff_t) page->index << PAGE_CACHE_SHIFT) + to;
+
+	kunmap(page);
+	if (pos > inode->i_size)
+		inode->i_size = pos;
+	return 0;
+}
+
+/*
+ * There is a small race here in that two processes might call this at
+ * the same time and both fail. So its a fail safe race :-) This should
+ * move into namei.c (and thus use the spinlock and do this properly)
+ * at some stage if we continue to use this set of functions for ensuring
+ * exclusive write access to the file
+ */
+static int get_exclusive_write_access(struct inode *inode)
+{
+	if (get_write_access(inode))
+		return -1;
+	if (atomic_read(&inode->i_writecount) != 1) {
+		put_write_access(inode);
+		return -1;
+	}
+	return 0;
+}
+
+static int dmfs_table_open(struct inode *inode, struct file *file)
+{
+	struct dentry *dentry = file->f_dentry;
+	struct inode *parent = dentry->d_parent->d_inode;
+
+	if (file->f_mode & FMODE_WRITE) {
+		if (get_exclusive_write_access(parent))
+			return -EPERM;
+	}
+
+	return 0;
+}
+
+static int dmfs_table_sync(struct file *file, struct dentry *dentry, int datasync)
+{
+	return 0;
+}
+
+static int dmfs_table_revalidate(struct dentry *dentry)
+{
+	struct inode *inode = dentry->d_inode;
+	struct inode *parent = dentry->d_parent->d_inode;
+
+	inode->i_size = parent->i_size;
+	return 0;
+}
+
+struct address_space_operations dmfs_address_space_operations = {
+	readpage:	dmfs_readpage,
+	writepage:	fail_writepage,
+	prepare_write:	dmfs_prepare_write,
+	commit_write:	dmfs_commit_write,
+};
+
+static struct file_operations dmfs_table_file_operations = {
+ 	llseek:		generic_file_llseek,
+	read:		generic_file_read,
+	write:		generic_file_write,
+	open:		dmfs_table_open,
+	release:	dmfs_table_release,
+	fsync:		dmfs_table_sync,
+};
+
+static struct inode_operations dmfs_table_inode_operations = {
+	revalidate:	dmfs_table_revalidate,
+};
+
+struct inode *dmfs_create_table(struct inode *dir, int mode)
+{
+	struct inode *inode = dmfs_new_inode(dir->i_sb, mode | S_IFREG);
+
+	if (inode) {
+		inode->i_mapping = dir->i_mapping;
+		inode->i_mapping->a_ops = &dmfs_address_space_operations;
+		inode->i_fop = &dmfs_table_file_operations;
+		inode->i_op = &dmfs_table_inode_operations;
+	}
+
+	return inode;
+}
+

driver/device-mapper/dmfs-tdir.c

@@ -0,0 +1,138 @@
+/*
+ * dmfs-tdir.c
+ *
+ * Copyright (C) 2001 Sistina Software
+ *
+ * This software 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, or (at
+ * your option) any later version.
+ *
+ * This software 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 GNU CC; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* Heavily based upon ramfs */
+
+#include <linux/config.h>
+#include <linux/fs.h>
+
+#include "dm.h"
+#include "dmfs.h"
+
+extern struct inode *dmfs_create_error(struct inode *, int);
+extern struct inode *dmfs_create_table(struct inode *, int);
+extern struct inode *dmfs_create_status(struct inode *, int);
+
+
+static int dmfs_tdir_unlink(struct inode *dir, struct dentry *dentry)
+{
+	struct inode *inode = dentry->d_inode;
+
+	inode->i_mapping = &inode->i_data;
+	inode->i_nlink--;
+	dput(dentry);
+	return 0;
+}
+
+static struct dentry *dmfs_tdir_lookup(struct inode *dir, struct dentry *dentry)
+{
+	struct inode *inode = NULL;
+	const char *name = dentry->d_name.name;
+
+	switch(dentry->d_name.len) {
+		case 5:
+			if (memcmp("table", name, 5) == 0) {
+				inode = dmfs_create_table(dir, 0600);
+				break;
+			}
+			if (memcmp("error", name, 5) == 0)
+				inode = dmfs_create_error(dir, 0600);
+			break;
+		case 6:
+			if (memcmp("status", name, 6) == 0)
+				inode = dmfs_create_status(dir, 0600);
+			break;
+	}
+
+	d_add(dentry, inode);
+	return NULL;
+}
+
+static int dmfs_tdir_readdir(struct file *filp, void *dirent, filldir_t filldir)
+{
+	int i;
+	struct dentry *dentry = filp->f_dentry;
+
+	i = filp->f_pos;
+	switch(i) {
+		case 0:
+			if (filldir(dirent, ".", 1, i, dentry->d_inode->i_ino, DT_DIR) < 0)
+				break;
+			i++;
+			filp->f_pos++;
+			/* fallthrough */
+		case 1:
+			if (filldir(dirent, "..", 2, i, dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
+				break;
+			i++;
+			filp->f_pos++;
+			/* fallthrough */
+		case 2:
+			if (filldir(dirent, "table", 5, i, 2, DT_REG) < 0)
+				break;
+			i++;
+			filp->f_pos++;
+			/* fallthrough */
+		case 3:
+			if (filldir(dirent, "error", 5, i, 3, DT_REG) < 0)
+				break;
+			i++;
+			filp->f_pos++;
+			/* fallthrough */
+		case 4:
+			if (filldir(dirent, "status", 6, i, 4, DT_REG) < 0)
+				break;
+			i++;
+			filp->f_pos++;
+	}
+	return 0;
+}
+
+
+static int dmfs_tdir_sync(struct file *file, struct dentry *dentry, int datasync)
+{
+	return 0;
+}
+
+static struct file_operations dmfs_tdir_file_operations = {
+	read:		generic_read_dir,
+	readdir:	dmfs_tdir_readdir,
+	fsync:		dmfs_tdir_sync,
+};
+
+static struct inode_operations dmfs_tdir_inode_operations = {
+	lookup:		dmfs_tdir_lookup,
+	unlink:		dmfs_tdir_unlink,
+};
+
+struct inode *dmfs_create_tdir(struct super_block *sb, int mode)
+{
+	struct inode *inode = dmfs_new_private_inode(sb, mode | S_IFDIR);
+
+	if (inode) {
+		inode->i_fop = &dmfs_tdir_file_operations;
+		inode->i_op = &dmfs_tdir_inode_operations;
+	}
+
+	return inode;
+}
+
+

driver/device-mapper/dmfs.h

@@ -0,0 +1,27 @@
+#ifndef LINUX_DMFS_H
+#define LINUX_DMFS_H
+
+struct dmfs_i {
+        struct semaphore sem;
+        struct dm_table *table;
+        struct mapped_device *md;
+        struct dentry *dentry;
+        struct list_head errors;
+	int status;
+};
+
+#define DMFS_I(inode) ((struct dmfs_i *)(inode)->u.generic_ip)
+
+
+extern int dmfs_init(void) __init;
+extern int dmfs_exit(void) __exit;
+
+struct inode *dmfs_new_inode(struct super_block *sb, int mode);
+struct inode *dmfs_new_private_inode(struct super_block *sb, int mode);
+
+void dmfs_add_error(struct inode *inode, unsigned num, char *str);
+void dmfs_zap_errors(struct inode *inode);
+
+
+
+#endif /* LINUX_DMFS_H */

driver/device-mapper/patches/00_config

@@ -0,0 +1,10 @@
+--- linux-2.4.14/drivers/md/Config.in	Mon Sep 24 16:29:14 2001
++++ linux/drivers/md/Config.in	Tue Nov  6 11:25:35 2001
+@@ -14,5 +14,7 @@
+ dep_tristate '  Multipath I/O support' CONFIG_MD_MULTIPATH $CONFIG_BLK_DEV_MD
+ 
+ dep_tristate ' Logical volume manager (LVM) support' CONFIG_BLK_DEV_LVM $CONFIG_MD
++dep_tristate ' Device mapper support' CONFIG_BLK_DEV_DM $CONFIG_MD
++dep_tristate '  Device mapper linear target' CONFIG_BLK_DEV_DM_LINEAR $CONFIG_BLK_DEV_DM
+ 
+ endmenu

driver/device-mapper/patches/00_config_uml

@@ -0,0 +1,13 @@
+--- uml_build/arch/um/config.in.orig	Tue Jan  2 14:33:42 2001
++++ uml_build/arch/um/config.in	Tue Jan  2 14:35:42 2001
+@@ -15,6 +15,8 @@
+ bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
+ endmenu
+ 
++source drivers/md/Config.in
++
+ mainmenu_option next_comment
+ comment 'Processor features'
+ bool 'Symmetric multi-processing support' CONFIG_SMP
+
+

driver/device-mapper/patches/00_ksyms

@@ -0,0 +1,10 @@
+--- linux-2.4.14/kernel/ksyms.c	Tue Nov  6 11:18:14 2001
++++ linux/kernel/ksyms.c	Wed Nov  7 11:26:45 2001
+@@ -521,6 +521,7 @@
+ 
+ /* binfmt_aout */
+ EXPORT_SYMBOL(get_write_access);
++EXPORT_SYMBOL(deny_write_access);
+ 
+ /* time */
+ EXPORT_SYMBOL(get_fast_time);

driver/device-mapper/patches/00_makefile

@@ -0,0 +1,31 @@
+--- linux-2.4.14/drivers/md/Makefile	Mon Sep 24 16:29:14 2001
++++ linux/drivers/md/Makefile	Wed Nov  7 10:48:26 2001
+@@ -4,9 +4,12 @@
+ 
+ O_TARGET	:= mddev.o
+ 
+-export-objs	:= md.o xor.o
++export-objs	:= md.o xor.o dm-table.o dm-target.o
+ list-multi	:= lvm-mod.o
+ lvm-mod-objs	:= lvm.o lvm-snap.o
++dm-mod-objs	:= dm.o dm-table.o dm-target.o dmfs-super.o dmfs-root.o \
++		   dmfs-tdir.o dmfs-table.o dmfs-error.o dmfs-status.o \
++		   dmfs-lv.o seq_file.o
+ 
+ # Note: link order is important.  All raid personalities
+ # and xor.o must come before md.o, as they each initialise 
+@@ -20,8 +23,14 @@
+ obj-$(CONFIG_MD_MULTIPATH)	+= multipath.o
+ obj-$(CONFIG_BLK_DEV_MD)	+= md.o
+ obj-$(CONFIG_BLK_DEV_LVM)	+= lvm-mod.o
++obj-$(CONFIG_BLK_DEV_DM)        += dm-mod.o
++obj-$(CONFIG_BLK_DEV_DM_LINEAR) += dm-linear.o
+ 
+ include $(TOPDIR)/Rules.make
+ 
+ lvm-mod.o: $(lvm-mod-objs)
+ 	$(LD) -r -o $@ $(lvm-mod-objs)
++
++dm-mod.o: $(dm-mod-objs)
++	$(LD) -r -o $@ $(dm-mod-objs)
++

driver/device-mapper/patches/INDEX

@@ -0,0 +1,13 @@
+00_latest		Latest source - I only tend to update this before 
+                        making a release.  So if you got this from CVS copy
+                        or link the source files in by hand.
+
+00_config		Add device-mapper to the MD section
+
+00_config_uml           only apply for uml, turns on the md section
+
+00_makefile		Add device-mapper to the MD Makefile.
+
+00_bh-async-3		AA's async bh patch so we can hook b_end_io
+                        to keep track of pending io.
+

driver/device-mapper/projects.txt

@@ -0,0 +1,6 @@
+    List of projects, ideas and pending bug fixes
+   ===============================================
+
+ o Check tables are an integer multiple of the underlying block size at
+   table load time.
+

driver/device-mapper/seq_file.c

@@ -0,0 +1,240 @@
+/*
+ * linux/fs/seq_file.c
+ *
+ * helper functions for making syntetic files from sequences of records.
+ * initial implementation -- AV, Oct 2001.
+ *
+ * Slight modifications to the original. Will be passed on to Al Viro in
+ * the next few days.
+ */
+
+#include <linux/malloc.h>
+#include <linux/fs.h>
+#include <linux/seq_file.h>
+#include <asm/uaccess.h>
+
+/**
+ *	seq_open -	initialize sequential file
+ *	@file: file we initialize
+ *	@op: method table describing the sequence
+ *
+ *	seq_open() sets @file, associating it with a sequence described
+ *	by @op.  @op->start() sets the iterator up and returns the first
+ *	element of sequence. @op->stop() shuts it down.  @op->next()
+ *	returns the next element of sequence.  @op->show() prints element
+ *	into the buffer.  In case of error ->start() and ->next() return
+ *	ERR_PTR(error).  In the end of sequence they return %NULL. ->show()
+ *	returns 0 in case of success and negative number in case of error.
+ */
+int seq_open(struct file *file, struct seq_operations *op, void *context)
+{
+	struct seq_file *p = kmalloc(sizeof(*p), GFP_KERNEL);
+	if (!p)
+		return -ENOMEM;
+	memset(p, 0, sizeof(*p));
+	sema_init(&p->sem, 1);
+	p->op = op;
+	p->context = context;
+	file->private_data = p;
+	return 0;
+}
+
+/**
+ *	seq_read -	->read() method for sequential files.
+ *	@file, @buf, @size, @ppos: see file_operations method
+ *
+ *	Ready-made ->f_op->read()
+ */
+ssize_t seq_read(struct file *file, char *buf, size_t size, loff_t *ppos)
+{
+	struct seq_file *m = (struct seq_file *)file->private_data;
+	size_t copied = 0;
+	loff_t pos;
+	size_t n;
+	void *p;
+	int err = 0;
+
+	if (ppos != &file->f_pos)
+		return -EPIPE;
+
+	down(&m->sem);
+	/* grab buffer if we didn't have one */
+	if (!m->buf) {
+		m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
+		if (!m->buf)
+			goto Enomem;
+	}
+	/* if not empty - flush it first */
+	if (m->count) {
+		n = min(m->count, size);
+		err = copy_to_user(buf, m->buf + m->from, n);
+		if (err)
+			goto Efault;
+		m->count -= n;
+		m->from += n;
+		size -= n;
+		buf += n;
+		copied += n;
+		if (!m->count)
+			(*ppos)++;
+		if (!size)
+			goto Done;
+	}
+	/* we need at least one record in buffer */
+	while (1) {
+		pos = *ppos;
+		p = m->op->start(m->context, &pos);
+		err = PTR_ERR(p);
+		if (!p || IS_ERR(p))
+			break;
+		err = m->op->show(m, p);
+		if (err)
+			break;
+		if (m->count < m->size)
+			goto Fill;
+		m->op->stop(m->context, p);
+		kfree(m->buf);
+		m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
+		if (!m->buf)
+			goto Enomem;
+	}
+	m->op->stop(m->context, p);
+	goto Done;
+Fill:
+	/* they want more? let's try to get some more */
+	while (m->count < size) {
+		size_t offs = m->count;
+		loff_t next = pos;
+		p = m->op->next(m->context, p, &next);
+		if (!p || IS_ERR(p)) {
+			err = PTR_ERR(p);
+			break;
+		}
+		err = m->op->show(m, p);
+		if (err || m->count == m->size) {
+			m->count = offs;
+			break;
+		}
+		pos = next;
+	}
+	m->op->stop(m->context, p);
+	n = min(m->count, size);
+	err = copy_to_user(buf, m->buf, n);
+	if (err)
+		goto Efault;
+	copied += n;
+	m->count -= n;
+	if (m->count)
+		m->from = n;
+	else
+		pos++;
+	*ppos = pos;
+Done:
+	if (!copied)
+		copied = err;
+	up(&m->sem);
+	return copied;
+Enomem:
+	err = -ENOMEM;
+	goto Done;
+Efault:
+	err = -EFAULT;
+	goto Done;
+}
+
+/**
+ *	seq_lseek -	->llseek() method for sequential files.
+ *	@file, @offset, @origin: see file_operations method
+ *
+ *	Ready-made ->f_op->llseek()
+ */
+loff_t seq_lseek(struct file *file, loff_t offset, int origin)
+{
+	struct seq_file *m = (struct seq_file *)file->private_data;
+	long long retval = -EINVAL;
+
+	down(&m->sem);
+	switch (origin) {
+		case 1:
+			offset += file->f_pos;
+		case 0:
+			if (offset < 0)
+				break;
+			if (offset != file->f_pos) {
+				file->f_pos = offset;
+				m->count = 0;
+			}
+			retval = offset;
+	}
+	up(&m->sem);
+	return retval;
+}
+
+/**
+ *	seq_release -	free the structures associated with sequential file.
+ *	@file: file in question
+ *	@inode: file->f_dentry->d_inode
+ *
+ *	Frees the structures associated with sequential file; can be used
+ *	as ->f_op->release() if you don't have private data to destroy.
+ */
+int seq_release(struct inode *inode, struct file *file)
+{
+	struct seq_file *m = (struct seq_file *)file->private_data;
+	kfree(m->buf);
+	kfree(m);
+	return 0;
+}
+
+/**
+ *	seq_escape -	print string into buffer, escaping some characters
+ *	@m:	target buffer
+ *	@s:	string
+ *	@esc:	set of characters that need escaping
+ *
+ *	Puts string into buffer, replacing each occurence of character from
+ *	@esc with usual octal escape.  Returns 0 in case of success, -1 - in
+ *	case of overflow.
+ */
+int seq_escape(struct seq_file *m, const char *s, const char *esc)
+{
+	char *end = m->buf + m->size;
+        char *p;
+	char c;
+
+        for (p = m->buf + m->count; (c = *s) != '\0' && p < end; s++) {
+		if (!strchr(esc, c)) {
+			*p++ = c;
+			continue;
+		}
+		if (p + 3 < end) {
+			*p++ = '\\';
+			*p++ = '0' + ((c & 0300) >> 6);
+			*p++ = '0' + ((c & 070) >> 3);
+			*p++ = '0' + (c & 07);
+			continue;
+		}
+		m->count = m->size;
+		return -1;
+        }
+	m->count = p - m->buf;
+        return 0;
+}
+
+int seq_printf(struct seq_file *m, const char *f, ...)
+{
+	va_list args;
+	int len;
+
+	if (m->count < m->size) {
+		va_start(args, f);
+		len = vsnprintf(m->buf + m->count, m->size - m->count, f, args);
+		va_end(args);
+		if (m->count + len < m->size) {
+			m->count += len;
+			return 0;
+		}
+	}
+	m->count = m->size;
+	return -1;
+}

driver/device-mapper/seq_file.h

@@ -0,0 +1,60 @@
+/*
+ * Original file by Al Viro. This is a slight modification which I'll
+ * pass on to Al Viro shortly.
+ */
+#ifndef _LINUX_SEQ_FILE_H
+#define _LINUX_SEQ_FILE_H
+#ifdef __KERNEL__
+
+struct seq_operations;
+
+struct seq_file {
+	char *buf;
+	size_t size;
+	size_t from;
+	size_t count;
+	loff_t index;
+	struct semaphore sem;
+	struct seq_operations *op;
+	void *context;
+};
+
+struct seq_operations {
+	void * (*start) (void *context, loff_t *pos);
+	void (*stop) (void *context, void *v);
+	void * (*next) (void *context, void *v, loff_t *pos);
+	int (*show) (struct seq_file *m, void *v);
+};
+
+int seq_open(struct file *, struct seq_operations *, void *context);
+ssize_t seq_read(struct file *, char *, size_t, loff_t *);
+loff_t seq_lseek(struct file *, loff_t, int);
+int seq_release(struct inode *, struct file *);
+int seq_escape(struct seq_file *, const char *, const char *);
+
+static inline int seq_putc(struct seq_file *m, char c)
+{
+	if (m->count < m->size) {
+		m->buf[m->count++] = c;
+		return 0;
+	}
+	return -1;
+}
+
+static inline int seq_puts(struct seq_file *m, const char *s)
+{
+	int len = strlen(s);
+	if (m->count + len < m->size) {
+		memcpy(m->buf + m->count, s, len);
+		m->count += len;
+		return 0;
+	}
+	m->count = m->size;
+	return -1;
+}
+
+int seq_printf(struct seq_file *, const char *, ...)
+	__attribute__ ((format (printf,2,3)));
+
+#endif
+#endif

driver/user_mode_linux/README

@@ -0,0 +1,30 @@
+FILES
+-----
+
+setup-uml - script to build a user mode linux system, with the lvm driver
+            symbolically linked back to the LVM dir so I can work from CVS.
+
+uml-lvm.patch - patch to enable lvm in the uml configuration
+
+uml.patch.bz2 - uml patch from 
+                http://sourceforge.net/project/showfiles.php?group_id=429
+
+config-uml - .config which turns on LVM
+
+
+RUNNING 
+-------
+
+o checkout an LVM dir for use with uml
+  make sure you've got a copy of a root filesystem kicking about
+
+o edit the variables at the top of 'setup'
+
+o run setup-uml
+
+o move to your uml dir and run lvm-install as root
+
+o then run the 'up' script to run uml
+
+o if you want to rebuild uml after changing the LVM driver just change into
+  the linux directory and do a 'make linux ARCH=um'.  Don't forget the ARCH=um.

driver/user_mode_linux/config-uml

@@ -0,0 +1,299 @@
+#
+# Automatically generated by make menuconfig: don't edit
+#
+CONFIG_USERMODE=y
+# CONFIG_ISA is not set
+# CONFIG_SBUS is not set
+# CONFIG_PCI is not set
+CONFIG_UID16=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+# CONFIG_BLK_DEV_MD is not set
+# CONFIG_MD_LINEAR is not set
+# CONFIG_MD_RAID0 is not set
+# CONFIG_MD_RAID1 is not set
+# CONFIG_MD_RAID5 is not set
+# CONFIG_BLK_DEV_LVM is not set
+CONFIG_BLK_DEV_DM=y
+
+#
+# General Setup
+#
+CONFIG_STDIO_CONSOLE=y
+CONFIG_NET=y
+CONFIG_SYSVIPC=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SYSCTL=y
+CONFIG_BINFMT_AOUT=y
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=256
+CONFIG_SSL=y
+CONFIG_HOSTFS=m
+CONFIG_MCONSOLE=y
+CONFIG_MAGIC_SYSRQ=y
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_KMOD is not set
+
+#
+# Devices
+#
+CONFIG_BLK_DEV_UBD=y
+# CONFIG_BLK_DEV_UBD_SYNC is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_NBD=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_MMAPPER is not set
+
+#
+# Networking options
+#
+# CONFIG_PACKET is not set
+CONFIG_NETLINK=y
+# CONFIG_RTNETLINK is not set
+# CONFIG_NETLINK_DEV is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_FILTER is not set
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_INET_ECN is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_IPV6 is not set
+# CONFIG_KHTTPD is not set
+# CONFIG_ATM is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_DECNET is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_LLC is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network drivers
+#
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+CONFIG_DUMMY=y
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=y
+CONFIG_ETHERTAP=y
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_DL2K is not set
+# CONFIG_MYRI_SBUS is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=y
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPP_DEFLATE is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPPOE is not set
+CONFIG_SLIP=y
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+# CONFIG_NET_FC is not set
+# CONFIG_RCPCI is not set
+# CONFIG_SHAPER is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+CONFIG_UML_NET=y
+CONFIG_UML_NET_ETHERTAP=y
+CONFIG_UML_NET_SLIP=y
+CONFIG_UML_NET_DAEMON=y
+CONFIG_UML_NET_MCAST=y
+CONFIG_ETHERTAP=y
+CONFIG_TUN=y
+
+#
+# File systems
+#
+CONFIG_QUOTA=y
+CONFIG_AUTOFS_FS=m
+CONFIG_AUTOFS4_FS=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADFS_FS_RW is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_BFS_FS is not set
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_UMSDOS_FS=m
+CONFIG_VFAT_FS=m
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_TMPFS is not set
+# CONFIG_RAMFS is not set
+CONFIG_ISO9660_FS=m
+# CONFIG_JOLIET is not set
+CONFIG_MINIX_FS=m
+# CONFIG_VXFS_FS is not set
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+# CONFIG_HPFS_FS is not set
+CONFIG_PROC_FS=y
+CONFIG_DEVFS_FS=y
+CONFIG_DEVFS_MOUNT=y
+# CONFIG_DEVFS_DEBUG is not set
+CONFIG_DEVPTS_FS=y
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX4FS_RW is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_EXT2_FS=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_UDF_FS is not set
+# CONFIG_UDF_RW is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_UFS_FS_WRITE is not set
+
+#
+# Network File Systems
+#
+# CONFIG_CODA_FS is not set
+# CONFIG_NFS_FS is not set
+# CONFIG_NFS_V3 is not set
+# CONFIG_ROOT_NFS is not set
+# CONFIG_NFSD is not set
+# CONFIG_NFSD_V3 is not set
+# CONFIG_SUNRPC is not set
+# CONFIG_LOCKD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+# CONFIG_NCPFS_NFS_NS is not set
+# CONFIG_NCPFS_OS2_NS is not set
+# CONFIG_NCPFS_SMALLDOS is not set
+# CONFIG_NCPFS_NLS is not set
+# CONFIG_NCPFS_EXTRAS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_SMB_NLS is not set
+CONFIG_NLS=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Kernel hacking
+#
+CONFIG_DEBUGSYM=y
+CONFIG_PT_PROXY=y
+# CONFIG_GPROF is not set
+# CONFIG_GCOV is not set

driver/user_mode_linux/setup-uml

@@ -0,0 +1,179 @@
+#! /usr/bin/perl -w
+
+use Cwd;
+
+##############################
+# Start user configurable bit
+##############################
+
+# Please use absolute paths too.
+# you can't use ~'s in your paths here.
+
+# the directory where you've checked out lvm, keep a seperate copy for uml,
+# the uml kernel will have links to these files
+$lvm_src="/home/thornber/sistina/LVM2";
+
+
+# the debian root image, get it from here:
+# http://prdownloads.sourceforge.net/user-mode-linux/root_fs_debian2.2_small.bz2
+# unzip it once you've downloaded it
+$root_fs="/home/thornber/uml/root_fs_debian2.2_small";
+
+# these are 100 Meg files created with dd
+# these become our PV's /dev/ubd/[1-4]
+# I sometimes use ubd/1 as swap though.
+@block_devices = ("/home/thornber/uml/scratch1",
+		  "/home/thornber/uml/scratch2",
+		  "/home/thornber/uml/scratch3",
+		  "/home/thornber/uml/scratch4");
+
+# directory where uml will be built, and the up, lvm-install scripts will
+# be placed
+$dest_dir="/home/thornber/builds/uml-lvm2";
+
+# It must be 2.4.8, can be .gz or .bz2
+$kernel_tarball="/home/thornber/packages/2.4/linux-2.4.9.tar";
+
+###############################
+# end of user configurable bit
+###############################
+
+
+$wd = cwd;
+$uml_patch = $wd . "/uml.patch.bz2";
+$lvm_uml_patch = $wd . "/uml-lvm.patch";
+$driver = $lvm_src . "/driver/device-mapper";
+
+
+# check we've got everything we need
+&check_file($root_fs);
+&check_dir($lvm_src);
+&check_file($kernel_tarball);
+&check_dir($dest_dir);
+&check_file($uml_patch);
+&check_file($lvm_uml_patch);
+
+
+chdir($dest_dir);
+&extract_kernel($dest_dir, $kernel_tarball);
+chdir("linux");
+&run_command("bzip2 -dc $uml_patch | patch -p1", "patching kernel with uml");
+&run_command("patch -p1 < $lvm_uml_patch", "enabling LVM driver");
+
+chdir("$dest_dir/linux");
+
+&run_command("cd include/linux; ln -s $driver/device-mapper.h",
+	     "linking device-mapper.h");
+
+&run_command("cd drivers/md; ln -s $driver/dm.h", "linking dm.h");
+&run_command("cd drivers/md; ln -s $driver/dm-fs.c", "linking dm-fs.c");
+&run_command("cd drivers/md; ln -s $driver/dm-table.c", "linking dm-table.c");
+&run_command("cd drivers/md; ln -s $driver/dm-target.c", 
+	     "linking dm-target.c");
+&run_command("cd drivers/md; ln -s $driver/dm.c", "linking dm.c");
+
+chdir("$dest_dir/linux");
+&run_command("make oldconfig ARCH=um", "making oldconfig ARCH=um");
+&run_command("make dep ARCH=um", "making dependencies");
+&run_command("make linux ARCH=um", "building linux uml");
+
+chdir($dest_dir);
+&run_command("ln -s $dest_dir/linux/linux uml", "creating link for linux");
+
+chdir($dest_dir);
+&run_command("ln -s $root_fs ./root_fs", "linking root filesystem");
+
+chdir($dest_dir);
+&link_devices();
+&write_up();
+&run_command("mkdir root_fs_mnt");
+&write_lvm_install();
+
+print "Dont forget to run $dest_dir/lvm-install as root\n";
+
+
+sub write_lvm_install {
+    open(OUT, "> lvm-install");
+    print OUT "#! /bin/sh\n\n";
+    print OUT <<"end";
+mount root_fs root_fs_mnt -o loop
+cd $lvm_src; make install; cd $dest_dir
+umount root_fs_mnt
+end
+
+    close OUT;
+    system "chmod +x lvm-install";
+}
+
+
+sub write_up {
+    open(UP, "> up");
+    print UP "#! /bin/sh\n\n./uml ";
+    $count = 1;
+    for $d (@block_devices) {
+	print UP "ubd$count=ubd$count ";
+	$count++;
+    }
+    print UP "\n";
+    close UP;
+    system("chmod +x up");
+}
+
+sub link_devices {
+    $count = 1;
+    foreach $d (@block_devices) {
+	&run_command("ln -s $d ubd$count",
+		     "linking block device ubd$count");
+	$count++;
+    }
+}
+
+sub extract_kernel {
+    my($dest, $tb) = @_;
+    my($cmd);
+    if($tb =~ m/\.bz2/) {
+	$cmd = "tar Ixf $tb";
+
+    } elsif($tb =~ m/\.gz/) {
+	$cmd = "tar zxf $tb";
+
+    } else {
+	$cmd = "tar xf $tb";
+    }
+
+    &run_command($cmd, "extracting kernel");
+}
+
+sub run_command {
+    my($cmd) = shift;
+    my($desc) = shift;
+    my($r);
+    print STDERR $desc, " ... ";
+    $r = system("$cmd > /dev/null");
+    if(!$r) {
+	print STDERR "done.\n";
+	return;
+    } else {
+	print STDERR "failed.\n";
+	exit(1);
+    }
+}
+
+sub check_file {
+    $f = shift;
+    if(! -e $f) {
+	print STDERR "couldn't find $f\n";
+	exit;
+    }
+}
+
+sub check_dir {
+    $f = shift;
+    if(! -e $f || ! -d $f) {
+	print STDERR "couldn't find a directory called $f\n";
+	exit;
+    }
+}
+
+
+

driver/user_mode_linux/uml-lvm.patch

@@ -0,0 +1,30 @@
+--- uml_build/arch/um/config.in.orig	Tue Jan  2 14:33:42 2001
++++ uml_build/arch/um/config.in	Tue Jan  2 14:35:42 2001
+@@ -15,6 +15,8 @@
+ bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
+ endmenu
+ 
++source drivers/md/Config.in
++
+ mainmenu_option next_comment
+ comment 'Processor features'
+ bool 'Symmetric multi-processing support' CONFIG_SMP
+--- linux/drivers/md/Config.in.orig	Tue Aug 21 14:18:30 2001
++++ linux/drivers/md/Config.in	Tue Aug 21 14:19:08 2001
+@@ -14,4 +14,6 @@
+ 
+ dep_tristate ' Logical volume manager (LVM) support' CONFIG_BLK_DEV_LVM $CONFIG_MD
+ 
++dep_tristate ' Device mapper support' CONFIG_BLK_DEV_DM $CONFIG_MD
++
+ endmenu
+--- linux/drivers/md/Makefile.orig	Tue Aug 21 14:19:14 2001
++++ linux/drivers/md/Makefile	Tue Aug 21 14:20:06 2001
+@@ -19,6 +19,7 @@
+ obj-$(CONFIG_MD_RAID5)		+= raid5.o xor.o
+ obj-$(CONFIG_BLK_DEV_MD)	+= md.o
+ obj-$(CONFIG_BLK_DEV_LVM)	+= lvm-mod.o
++obj-$(CONFIG_BLK_DEV_DM)	+= dm.o dm-table.o dm-target.o dm-fs.o dm-parse.o
+ 
+ include $(TOPDIR)/Rules.make
+ 

include/.symlinks

@@ -1,49 +1,23 @@
-../daemons/clvmd/clvm.h
 ../lib/activate/activate.h
-../lib/activate/targets.h
-../lib/cache/lvmcache.h
-../lib/commands/errors.h
-../lib/commands/toolcontext.h
 ../lib/config/config.h
-../lib/config/defaults.h
+../lib/datastruct/bitset.h
 ../lib/datastruct/btree.h
+../lib/datastruct/hash.h
 ../lib/datastruct/list.h
 ../lib/datastruct/lvm-types.h
-../lib/datastruct/str_list.h
 ../lib/device/dev-cache.h
 ../lib/device/device.h
 ../lib/display/display.h
 ../lib/filters/filter-composite.h
-../lib/filters/filter-md.h
 ../lib/filters/filter-persistent.h
 ../lib/filters/filter-regex.h
-../lib/filters/filter-sysfs.h
 ../lib/filters/filter.h
 ../lib/format1/format1.h
-../lib/format_pool/format_pool.h
-../lib/format_text/archiver.h
-../lib/format_text/format-text.h
-../lib/format_text/text_export.h
-../lib/format_text/text_import.h
-../lib/label/label.h
-../lib/locking/locking.h
 ../lib/log/log.h
-../lib/metadata/lv_alloc.h
 ../lib/metadata/metadata.h
-../lib/metadata/pv_alloc.h
-../lib/metadata/segtype.h
-../lib/mm/memlock.h
+../lib/mm/dbg_malloc.h
+../lib/mm/pool.h
 ../lib/mm/xlate.h
-../lib/misc/configure.h
-../lib/misc/crc.h
-../lib/misc/intl.h
-../lib/misc/lib.h
-../lib/misc/lvm-exec.h
-../lib/misc/lvm-file.h
-../lib/misc/lvm-string.h
-../lib/misc/sharedlib.h
 ../lib/regex/matcher.h
-../lib/report/report.h
 ../lib/uuid/uuid.h
-../po/pogen.h
-../tools/version.h
+../lib/cmgr/cmgr.h

include/Makefile.in

@@ -1,16 +1,20 @@
 #
-# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2001 Sistina Software
 #
-# This file is part of the LVM2.
+# This LVM library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
 #
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU General Public License v.2.
+# This LVM library 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
+# Library 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
+# You should have received a copy of the GNU Library General Public
+# License along with this LVM library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+# MA 02111-1307, USA
 
 SHELL = /bin/sh
 
@@ -20,8 +24,6 @@ VPATH = @srcdir@
 
 LN_S = @LN_S@
 
-.PHONY: clean distclean all install pofile install_cluster
-
 all: .symlinks_created
 
 .symlinks_created: .symlinks
@@ -29,17 +31,11 @@ all: .symlinks_created
 	for i in `cat .symlinks`; do $(LN_S) $$i ; done
 	touch $@
 
+clean:
+
 distclean:
 	find . -maxdepth 1 -type l -exec $(RM) \{\} \;
 	$(RM) Makefile .include_symlinks .symlinks_created
 
-pofile: all
-
-clean:
-
-install:
-
-install_cluster:
-
-cflow:
+.PHONY: clean distclean all
 

lib/Makefile.in

@@ -1,155 +1,60 @@
 #
-# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2001 Sistina Software (UK) Limited
 #
-# This file is part of the LVM2.
+# This file is released under the GPL.
 #
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU General Public License v.2.
-#
-# 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
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-ifeq ("@LVM1@", "shared")
-  SUBDIRS = format1
-endif
-
-ifeq ("@POOL@", "shared")
-  SUBDIRS += format_pool
-endif
-
-ifeq ("@SNAPSHOTS@", "shared")
-  SUBDIRS += snapshot
-endif
-
-ifeq ("@MIRRORS@", "shared")
-  SUBDIRS += mirror
-endif
-
-SOURCES =\
+SOURCES=\
 	activate/activate.c \
-	cache/lvmcache.c \
-	commands/toolcontext.c \
+	activate/fs.c \
 	config/config.c \
+	datastruct/bitset.c \
 	datastruct/btree.c \
-	datastruct/list.c \
-	datastruct/str_list.c \
+	datastruct/hash.c \
 	device/dev-cache.c \
 	device/dev-io.c \
-	device/dev-md.c \
 	device/device.c \
 	display/display.c \
-	error/errseg.c \
 	filters/filter-composite.c \
 	filters/filter-persistent.c \
 	filters/filter-regex.c \
-	filters/filter-sysfs.c \
-	filters/filter-md.c \
 	filters/filter.c \
-	format_text/archive.c \
-	format_text/archiver.c \
-	format_text/export.c \
-	format_text/flags.c \
-	format_text/format-text.c \
-	format_text/import.c \
-	format_text/import_vsn1.c \
-	format_text/tags.c \
-	format_text/text_label.c \
-	label/label.c \
-	locking/file_locking.c \
-	locking/locking.c \
-	locking/no_locking.c \
-	log/log.c \
-	metadata/lv_manip.c \
-	metadata/merge.c \
-	metadata/metadata.c \
-	metadata/mirror.c \
-	metadata/pv_manip.c \
-	metadata/pv_map.c \
-	metadata/segtype.c \
-	metadata/snapshot_manip.c \
-	misc/crc.c \
-	misc/lvm-exec.c \
-	misc/lvm-file.c \
-	misc/lvm-string.c \
-	mm/memlock.c \
-	regex/matcher.c \
-	regex/parse_rx.c \
-	regex/ttree.c \
-	report/report.c \
-	striped/striped.c \
-	uuid/uuid.c \
-	zero/zero.c
-
-ifeq ("@LVM1@", "internal")
-  SOURCES +=\
 	format1/disk-rep.c \
 	format1/format1.c \
 	format1/import-export.c \
-	format1/import-extents.c \
 	format1/layout.c \
-	format1/lvm1-label.c \
-	format1/vg_number.c
-endif
+	format1/vg_number.c \
+	log/log.c \
+	metadata/lv_manip.c \
+	metadata/metadata.c \
+	metadata/pv_map.c \
+	mm/dbg_malloc.c \
+	mm/pool.c \
+	regex/matcher.c \
+	regex/parse_rx.c \
+	regex/ttree.c \
+	cmgr/cmgr.c \
+	uuid/uuid.c
 
-ifeq ("@POOL@", "internal")
-  SOURCES +=\
-	format_pool/disk_rep.c \
-	format_pool/format_pool.c \
-	format_pool/import_export.c \
-	format_pool/pool_label.c
-endif
+TARGETS=liblvm.a $(SLIB_SOV) $(SLIB_SOM) $(SLIB_SO)
 
-ifeq ("@CLUSTER@", "internal")
-  SOURCES += locking/cluster_locking.c
-endif
+include ../make.tmpl
 
-ifeq ("@CLUSTER@", "shared")
-  SUBDIRS += locking
-endif
+liblvm.a: $(OBJECTS)
+	$(RM) $@
+	$(AR) r $@ $(OBJECTS)
+	$(RANLIB) $@
 
-ifeq ("@SNAPSHOTS@", "internal")
-  SOURCES += snapshot/snapshot.c
-endif
+$(SLIB_SOV): $(POBJECTS)
+	$(CC) -shared -Wl,-soname,$(SLIB_SOM) -o $(SLIB_SOV) $(POBJECTS)
 
-ifeq ("@MIRRORS@", "internal")
-  SOURCES += mirror/mirrored.c
-endif
+$(SLIB_SOM): $(SLIB_SOV)
+	ln -sf $(SLIB_SOV) $(SLIB_SOM)
 
-ifeq ("@DEVMAPPER@", "yes")
-  SOURCES +=\
-	activate/dev_manager.c \
-	activate/fs.c
-endif
+$(SLIB_SO): $(SLIB_SOV)
+	ln -sf $(SLIB_SOV) $(SLIB_SO)
 
-ifeq ("@HAVE_LIBDL@", "yes")
-  SOURCES +=\
-	locking/external_locking.c \
-	misc/sharedlib.c
-endif
-
-ifeq ("@DMEVENTD@", "yes")
-  CLDFLAGS += -ldevmapper-event
-endif
-
-LIB_STATIC = liblvm.a
-
-$(SUBDIRS): $(LIB_STATIC)
-
-CLEAN_TARGETS += liblvm.cflow
-
-include $(top_srcdir)/make.tmpl
-
-liblvm.cflow: $(SOURCES)
-	set -e; (echo -n "SOURCES += "; \
-		 echo $(SOURCES) | \
-		 sed "s/^/ /;s/ / $(top_srcdir)\/lib\//g;s/$$//"; \
-		 ) > $@
-
-cflow: liblvm.cflow

lib/README

@@ -0,0 +1 @@
+Base library directory

lib/activate/activate.h

@@ -1,94 +1,53 @@
 /*
- * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.  
- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2001 Sistina Software (UK) Limited.
  *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * 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
+ * This file is released under the GPL.
  */
 
 #ifndef LVM_ACTIVATE_H
 #define LVM_ACTIVATE_H
 
-#include "metadata.h"
+#include <libdevmapper.h>
 
-struct lvinfo {
-	int exists;
-	int suspended;
-	unsigned int open_count;
-	int major;
-	int minor;
-	int read_only;
-	int live_table;
-	int inactive_table;
-};
+/* FIXME Snapshot handling? */
 
-void set_activation(int activation);
-int activation(void);
+int lv_active(struct logical_volume *lv);
+int lv_open_count(struct logical_volume *lv);
+int lv_info(struct logical_volume *lv, struct dm_info *info);
 
-int driver_version(char *version, size_t size);
-int library_version(char *version, size_t size);
-int lvm1_present(struct cmd_context *cmd);
-
-int target_present(const char *target_name, int use_modprobe);
-int target_version(const char *target_name, uint32_t *maj,
-                   uint32_t *min, uint32_t *patchlevel);
-
-void activation_release(void);
-void activation_exit(void);
-
-int lv_suspend(struct cmd_context *cmd, const char *lvid_s);
-int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s);
-int lv_resume(struct cmd_context *cmd, const char *lvid_s);
-int lv_resume_if_active(struct cmd_context *cmd, const char *lvid_s);
-int lv_activate(struct cmd_context *cmd, const char *lvid_s, int exclusive);
-int lv_activate_with_filter(struct cmd_context *cmd, const char *lvid_s,
-			    int exclusive);
-int lv_deactivate(struct cmd_context *cmd, const char *lvid_s);
-
-int lv_mknodes(struct cmd_context *cmd, const struct logical_volume *lv);
+int lv_activate(struct logical_volume *lv);
+int lv_reactivate(struct logical_volume *lv);
+int lv_deactivate(struct logical_volume *lv);
+int lv_suspend(struct logical_volume *lv, int sus);
 
 /*
- * Returns 1 if info structure has been populated, else 0.
- */
-int lv_info(struct cmd_context *cmd, const struct logical_volume *lv, struct lvinfo *info,
-	    int with_open_count);
-int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s,
-		    struct lvinfo *info, int with_open_count);
-
-/*
- * Returns 1 if activate_lv has been set: 1 = activate; 0 = don't.
- */
-int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s,
-			 int *activate_lv);
-
-/*
- * Returns 1 if percent has been set, else 0.
- */
-int lv_snapshot_percent(const struct logical_volume *lv, float *percent);
-int lv_mirror_percent(struct cmd_context *cmd, struct logical_volume *lv,
-		      int wait, float *percent, uint32_t *event_nr);
-
-/*
- * Return number of LVs in the VG that are active.
+ * Return number of LVs in the VG that are
+ * active.
  */
 int lvs_in_vg_activated(struct volume_group *vg);
 int lvs_in_vg_opened(struct volume_group *vg);
 
-
-int register_dev_for_events(struct cmd_context *cmd,
-			    struct logical_volume *lv, int do_reg);
+/*
+ * Test for (lv->status & LVM_WRITE)
+ */
+int lv_update_write_access(struct logical_volume *lv);
 
 /*
- * Returns 1 if PV has a dependency tree that uses anything in VG.
+ * Activate all LVs in the VG.  Ignore any that
+ * are already active.  Return number
+ * activated.
  */
-int pv_uses_vg(struct physical_volume *pv,
-	       struct volume_group *vg);
+int activate_lvs_in_vg(struct volume_group *vg);
+
+/*
+ * Deactivate all LVs in the VG
+ */
+int deactivate_lvs_in_vg(struct volume_group *vg);
+
+/*
+ *
+ * Suspend/resume
+ */
+int suspend_lvs_in_vg(struct volume_group *vg, int sus);
 
 #endif

lib/activate/dev_manager.h

@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.  
- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * 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
- */
-
-#ifndef _LVM_DEV_MANAGER_H
-#define _LVM_DEV_MANAGER_H
-
-struct logical_volume;
-struct volume_group;
-struct cmd_context;
-struct dev_manager;
-struct dm_info;
-struct device;
-
-/*
- * Constructor and destructor.
- */
-struct dev_manager *dev_manager_create(struct cmd_context *cmd,
-				       const char *vg_name);
-void dev_manager_destroy(struct dev_manager *dm);
-void dev_manager_release(void);
-void dev_manager_exit(void);
-
-/*
- * The device handler is responsible for creating all the layered
- * dm devices, and ensuring that all constraints are maintained
- * (eg, an origin is created before its snapshot, but is not
- * unsuspended until the snapshot is also created.)
- */
-int dev_manager_info(struct dm_pool *mem, const char *name,
-		     const struct logical_volume *lv,
-		     int mknodes, int with_open_count, struct dm_info *info);
-int dev_manager_snapshot_percent(struct dev_manager *dm,
-				 const struct logical_volume *lv,
-				 float *percent);
-int dev_manager_mirror_percent(struct dev_manager *dm,
-			       struct logical_volume *lv, int wait,
-			       float *percent, uint32_t *event_nr);
-int dev_manager_suspend(struct dev_manager *dm, struct logical_volume *lv,
-			int lockfs);
-int dev_manager_activate(struct dev_manager *dm, struct logical_volume *lv);
-int dev_manager_preload(struct dev_manager *dm, struct logical_volume *lv);
-int dev_manager_deactivate(struct dev_manager *dm, struct logical_volume *lv);
-
-int dev_manager_lv_mknodes(const struct logical_volume *lv);
-int dev_manager_lv_rmnodes(const struct logical_volume *lv);
-
-/*
- * Put the desired changes into effect.
- */
-int dev_manager_execute(struct dev_manager *dm);
-
-int dev_manager_device_uses_vg(struct device *dev,
-			       struct volume_group *vg);
-
-#endif