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,45 +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 = include man 
-
-ifeq ("@INTL@", "yes")
-  SUBDIRS += po
-endif
-
-SUBDIRS += lib tools
-
-ifeq ($(MAKECMDGOALS),distclean)
-  SUBDIRS += lib/format1 \
-	     po \
-	     test/mm test/device test/format1 test/regex test/filters
-endif
+SUBDIRS = include man lib tools
 
 include make.tmpl
 
-lib: include
-tools: lib
-po: lib tools
-
-ifeq ("@INTL@", "yes")
-lib.pofile: include.pofile
-tools.pofile: lib.pofile
-po.pofile: lib.pofile tools.pofile
-pofile: po.pofile
-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://ftp.sistina.com/pub/LVM2/tools/
-  ftp://ftp.sistina.com/pub/LVM2/device-mapper/
-
-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.00.09-cvs (2004-03-31)

WHATS_NEW

@@ -1,137 +0,0 @@
-  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,22 +0,0 @@
-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,3 +1,4 @@
+################################################################################
 ##
 ##    Copyright 1999-2000 Sistina Software, Inc.
 ##
@@ -45,30 +46,6 @@ AC_TYPE_SIZE_T
 AC_STRUCT_ST_RDEV
 AC_HEADER_TIME
 
-dnl Get system type
-AC_CANONICAL_SYSTEM
-
-case "$host_os" in
-	linux*)
-		CFLAGS= 
-		CLDFLAGS="-Wl,--version-script,.export.sym"
-		CLDWHOLEARCHIVE="-Wl,-whole-archive"
-		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
-		LD_DEPS=".export.sym"
-		SOFLAG="-shared"
-		DEVMAPPER=yes
-		ODIRECT=yes ;;
-	darwin*)
-		CFLAGS="-no-cpp-precomp -fno-common"
-		CLDFLAGS=
-		CLDWHOLEARCHIVE="-all_load"
-		CLDNOWHOLEARCHIVE=
-		LD_DEPS=
-		SOFLAG="-dynamiclib"
-		DEVMAPPER=no
-		ODIRECT=no ;;
-esac
-
 dnl -- prefix is /usr by default, the exec_prefix default is setup later
 AC_PREFIX_DEFAULT(/usr)
 
@@ -84,73 +61,21 @@ AC_ARG_WITH(group,
   [ GROUP="$withval" ],
   [ GROUP="root" ])
 
-dnl -- format1 inclusion type
-AC_ARG_WITH(lvm1,
-  [  --with-lvm1=TYPE        LVM1 metadata support: internal/shared/none
-                          [TYPE=internal] ],
-  [ LVM1="$withval" ],
-  [ LVM1="internal" ])
+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 ])
 
-if [[ "x$LVM1" != xnone -a "x$LVM1" != xinternal -a "x$LVM1" != xshared ]];
- then  AC_MSG_ERROR(
---with-lvm1 parameter invalid
-)
- exit
-fi;
+AC_ARG_ENABLE(jobs, [  --enable-jobs=NUM       Number of jobs to run simultaneously], JOBS=-j$enableval, JOBS=)
 
-if test x$LVM1 = xinternal; then
-	CFLAGS="$CFLAGS -DLVM1_INTERNAL"
-fi
-
-AC_ARG_ENABLE(jobs, [  --enable-jobs=NUM       Number of jobs to run simultaneously], JOBS=-j$enableval, JOBS=-j2)
-
-dnl Enables staticly-linked tools
-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)
 
-dnl Enable readline
-AC_ARG_ENABLE(readline, [  --enable-readline       Enable readline support],  \
-READLINE=$enableval, READLINE=no)
-
-if test x$READLINE = xyes; then
-	CFLAGS="$CFLAGS -DREADLINE_SUPPORT"
-fi
-
-echo $ac_n "checking whether to enable debugging""... $ac_c" 1>&6
-dnl Enable Debugging
-AC_ARG_ENABLE(debug,    [  --enable-debug          Enable debugging],  \
-DEBUG=yes, DEBUG=no)
-echo "$ac_t""$DEBUG" 1>&6
-
-echo $ac_n "checking whether to enable device-mapper""... $ac_c" 1>&6
-dnl Disable devmapper
-AC_ARG_ENABLE(devmapper, [  --disable-devmapper     Disable device-mapper interaction],  \
-DEVMAPPER=no)
-echo "$ac_t""$DEVMAPPER" 1>&6
-
-if test x$DEVMAPPER = xyes; then
-	CFLAGS="$CFLAGS -DDEVMAPPER_SUPPORT"
-fi
-
-echo $ac_n "checking whether to enable O_DIRECT""... $ac_c" 1>&6
-dnl Disable O_DIRECT
-AC_ARG_ENABLE(o_direct, [  --disable-o_direct      Disable O_DIRECT],  \
-ODIRECT=no)
-echo "$ac_t""$ODIRECT" 1>&6
-
-if test x$ODIRECT = xyes; then
-	CFLAGS="$CFLAGS -DO_DIRECT_SUPPORT"
-fi
-
-echo $ac_n "checking whether to compile liblvm2cmd.so""... $ac_c" 1>&6
-dnl Enable cmdlib
-AC_ARG_ENABLE(cmdlib, [  --enable-cmdlib         Build shared command library],  \
-CMDLIB=yes, CMDLIB=no)
-echo "$ac_t""$CMDLIB" 1>&6
-
-if test x$CMDLIB = xyes; then
-	CFLAGS="$CFLAGS -DCMDLIB"
-fi
+dnl Disable readline
+AC_ARG_ENABLE(readline, [  --disable-readline      Disable readline support],  \
+READLINE=$enableval, READLINE=yes)
 
 dnl Mess with default exec_prefix
 if [[ "x$exec_prefix" = xNONE -a "x$prefix" = xNONE ]];
@@ -180,17 +105,6 @@ Note: (n)curses also seems to work as a substitute for termcap.  This was
 	)
 fi
 
-dnl Check for dlopen
-AC_CHECK_LIB(dl, dlopen, HAVE_LIBDL=yes, HAVE_LIBDL=no)
-
-if test x$HAVE_LIBDL = xyes; then
-	CFLAGS="$CFLAGS -DHAVE_LIBDL"
-	LIBS="-ldl $LIBS"
-fi
-
-dnl Check for getopt
-AC_CHECK_HEADERS(getopt.h, CFLAGS="$CFLAGS -DHAVE_GETOPTLONG")
-
 dnl Check for readline (Shamelessly copied from parted 1.4.17)
 if test x$READLINE = xyes; then
 	AC_CHECK_LIB(readline, readline, ,
@@ -204,60 +118,15 @@ package as well (which may be called readline-devel or something similar).
 )
 		exit
 	)
-	AC_CHECK_FUNC(rl_completion_matches, CFLAGS="$CFLAGS -DHAVE_RL_COMPLETION_MATCHES")
-		
-fi
-
-echo $ac_n "checking whether to enable internationalisation""... $ac_c" 1>&6
-dnl Internationalisation stuff
-AC_ARG_ENABLE(nls, [  --enable-nls            Enable Native Language Support],\
-		INTL=yes, INTL=no)
-echo "$ac_t""$INTL" 1>&6
-
-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
-		)
-		exit  
-	fi;
-
-	AC_ARG_WITH(localedir,
-  		    [  --with-localedir=DIR    Translation files in DIR [PREFIX/share/locale]],
-  		    [ LOCALEDIR="$withval" ],
-  		    [ LOCALEDIR='${prefix}/share/locale' ])
-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(READLINE)
+AC_SUBST(kernel_dir)
 AC_SUBST(OWNER)
 AC_SUBST(GROUP)
-AC_SUBST(CFLAGS)
-AC_SUBST(CLDFLAGS)
-AC_SUBST(CLDWHOLEARCHIVE)
-AC_SUBST(CLDNOWHOLEARCHIVE)
-AC_SUBST(LD_DEPS)
-AC_SUBST(SOFLAG)
 AC_SUBST(LIBS)
-AC_SUBST(LVM_VERSION)
-AC_SUBST(DEBUG)
-AC_SUBST(DEVMAPPER)
-AC_SUBST(HAVE_LIBDL)
-AC_SUBST(CMDLIB)
-AC_SUBST(MSGFMT)
-AC_SUBST(LOCALEDIR)
-AC_SUBST(INTL_PACKAGE)
-AC_SUBST(INTL)
-
 dnl First and last lines should not contain files to generate in order to 
 dnl keep utility scripts running properly
 AC_OUTPUT( 								\
@@ -265,21 +134,11 @@ Makefile								\
 make.tmpl                                                               \
 include/Makefile						 	\
 lib/Makefile							 	\
-lib/format1/Makefile						 	\
 man/Makefile							 	\
-po/Makefile								\
 tools/Makefile							 	\
-tools/version.h								\
 test/mm/Makefile							\
 test/device/Makefile							\
 test/format1/Makefile							\
 test/regex/Makefile                                                     \
 test/filters/Makefile                                                   \
 )
-
-if test x$ODIRECT != xyes; then
-  echo
-  echo Warning: O_DIRECT disabled.
-  echo Use of pvmove may cause machine to lock up under low memory conditions.
-  echo
-fi

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

doc/README

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

doc/example.conf

@@ -1,269 +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.
-
-    # If using RAID md devices as physical volumes, you should
-    # set up a filter here to reject the constituent devices.
-
-    # Remember to run vgscan after you change this parameter to ensure 
-    # that the cache file gets regenerated (see below).
-
-    # 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
-
-    # An advanced setting.
-    # 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.
-    sysfs_scan = 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
-
-    # 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"
-
-    # Size (in KB) of each copy operation when mirroring
-    mirror_region_size = 512
-
-    # 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", "@*" ]
-}
-
-
-####################
-# Advanced section #
-####################
-
-# Metadata settings
-#
-# metadata {
-    # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
-    # It's best to leave this at 2.
-    # You might want to override it from the command line with 0 or 1 
-    # when running pvcreate on new PVs which are to be added to large VGs.
-
-    # pvmetadatacopies = 2
-
-    # 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" ]
-#}
-
-

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/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,41 +1,23 @@
 ../lib/activate/activate.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-persistent.h
 ../lib/filters/filter-regex.h
-../lib/filters/filter-sysfs.h
 ../lib/filters/filter.h
 ../lib/format1/format1.h
-../lib/format_text/format-text.h
-../lib/label/label.h
-../lib/locking/locking.h
 ../lib/log/log.h
-../lib/metadata/lv_alloc.h
 ../lib/metadata/metadata.h
 ../lib/mm/dbg_malloc.h
-../lib/mm/memlock.h
 ../lib/mm/pool.h
 ../lib/mm/xlate.h
-../lib/misc/crc.h
-../lib/misc/intl.h
-../lib/misc/lib.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
+../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
 
@@ -27,15 +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:
-
-.PHONY: clean distclean all install pofile
+.PHONY: clean distclean all
 

lib/Makefile.in

@@ -1,34 +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 (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
-
-SOURCES =\
+SOURCES=\
 	activate/activate.c \
-	cache/lvmcache.c \
-	commands/toolcontext.c \
+	activate/fs.c \
 	config/config.c \
 	datastruct/bitset.c \
 	datastruct/btree.c \
 	datastruct/hash.c \
-	datastruct/str_list.c \
 	device/dev-cache.c \
 	device/dev-io.c \
 	device/device.c \
@@ -36,68 +22,39 @@ SOURCES =\
 	filters/filter-composite.c \
 	filters/filter-persistent.c \
 	filters/filter-regex.c \
-	filters/filter-sysfs.c \
 	filters/filter.c \
-	format_text/archive.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 \
+	format1/disk-rep.c \
+	format1/format1.c \
+	format1/import-export.c \
+	format1/layout.c \
+	format1/vg_number.c \
 	log/log.c \
 	metadata/lv_manip.c \
-	metadata/merge.c \
 	metadata/metadata.c \
-	metadata/mirror.c \
 	metadata/pv_map.c \
-	metadata/snapshot_manip.c \
-	misc/crc.c \
-	misc/lvm-file.c \
-	misc/lvm-string.c \
-	mm/memlock.c \
+	mm/dbg_malloc.c \
 	mm/pool.c \
 	regex/matcher.c \
 	regex/parse_rx.c \
 	regex/ttree.c \
-	report/report.c \
-	uuid/uuid.c 
+	cmgr/cmgr.c \
+	uuid/uuid.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
-
-ifeq ("@DEBUG@", "yes")
-  SOURCES += mm/dbg_malloc.c
-endif
-
-ifeq ("@DEVMAPPER@", "yes")
-  SOURCES +=\
-	activate/dev_manager.c \
-	activate/fs.c
-endif
-
-ifeq ("@HAVE_LIBDL@", "yes")
-  SOURCES +=\
-	locking/external_locking.c \
-	misc/sharedlib.c
-endif
-
-LIB_STATIC = liblvm.a
-
-TARGETS = $(LIB_STATIC)
+TARGETS=liblvm.a $(SLIB_SOV) $(SLIB_SOM) $(SLIB_SO)
 
 include ../make.tmpl
 
+liblvm.a: $(OBJECTS)
+	$(RM) $@
+	$(AR) r $@ $(OBJECTS)
+	$(RANLIB) $@
+
+$(SLIB_SOV): $(POBJECTS)
+	$(CC) -shared -Wl,-soname,$(SLIB_SOM) -o $(SLIB_SOV) $(POBJECTS)
+
+$(SLIB_SOM): $(SLIB_SOV)
+	ln -sf $(SLIB_SOV) $(SLIB_SOM)
+
+$(SLIB_SO): $(SLIB_SOV)
+	ln -sf $(SLIB_SOV) $(SLIB_SO)
+

lib/README

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

lib/activate/activate.c

@@ -1,512 +1,292 @@
 /*
- * 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 LGPL.
  */
 
-#include "lib.h"
 #include "metadata.h"
 #include "activate.h"
-#include "memlock.h"
 #include "display.h"
+#include "log.h"
 #include "fs.h"
-#include "lvm-string.h"
-#include "pool.h"
-#include "toolcontext.h"
-#include "dev_manager.h"
-#include "str_list.h"
 
-#include <limits.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#define _skip(fmt, args...) log_very_verbose("Skipping: " fmt , ## args)
-
-#ifndef DEVMAPPER_SUPPORT
-void set_activation(int act)
+static void _build_lv_name(char *buffer, size_t s, struct logical_volume *lv)
 {
-	static int warned = 0;
-
-	if (warned || !act)
-		return;
-
-	log_error("Compiled without libdevmapper support. "
-		  "Can't enable activation.");
-
-	warned = 1;
-}
-int activation(void)
-{
-	return 0;
-}
-int library_version(char *version, size_t size)
-{
-	return 0;
-}
-int driver_version(char *version, size_t size)
-{
-	return 0;
-}
-int target_present(const char *target_name)
-{
-	return 0;
-}
-int lv_info(const struct logical_volume *lv, struct lvinfo *info)
-{
-	return 0;
-}
-int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s,
-		    struct lvinfo *info)
-{
-	return 0;
-}
-int lv_snapshot_percent(struct logical_volume *lv, float *percent)
-{
-	return 0;
-}
-int lv_mirror_percent(struct logical_volume *lv, int wait, float *percent,
-		      uint32_t *event_nr)
-{
-	return 0;
-}
-int lvs_in_vg_activated(struct volume_group *vg)
-{
-	return 0;
-}
-int lvs_in_vg_opened(struct volume_group *vg)
-{
-	return 0;
-}
-int lv_suspend(struct cmd_context *cmd, const char *lvid_s)
-{
-	return 1;
-}
-int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s)
-{
-	return 1;
-}
-int lv_resume(struct cmd_context *cmd, const char *lvid_s)
-{
-	return 1;
-}
-int lv_resume_if_active(struct cmd_context *cmd, const char *lvid_s)
-{
-	return 1;
-}
-int lv_deactivate(struct cmd_context *cmd, const char *lvid_s)
-{
-	return 1;
-}
-int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s,
-			 int *activate_lv)
-{
-	return 1;
-}
-int lv_activate(struct cmd_context *cmd, const char *lvid_s)
-{
-	return 1;
-}
-int lv_activate_with_filter(struct cmd_context *cmd, const char *lvid_s)
-{
-	return 1;
+	snprintf(buffer, s, "%s_%s", lv->vg->name, lv->name);
 }
 
-int lv_mknodes(struct cmd_context *cmd, const struct logical_volume *lv)
+static struct dm_task *_setup_task(struct logical_volume *lv, int task)
 {
-	return 1;
-}
-
-void activation_exit(void)
-{
-	return;
-}
-
-#else				/* DEVMAPPER_SUPPORT */
-
-static int _activation = 1;
-
-void set_activation(int act)
-{
-	if (act == _activation)
-		return;
-
-	_activation = act;
-	if (_activation)
-		log_verbose("Activation enabled. Device-mapper kernel "
-			    "driver will be used.");
-	else
-		log_verbose("Activation disabled. No device-mapper "
-			    "interaction will be attempted.");
-}
-
-int activation(void)
-{
-	return _activation;
-}
-
-static int _passes_activation_filter(struct cmd_context *cmd,
-				     struct logical_volume *lv)
-{
-	struct config_node *cn;
-	struct config_value *cv;
-	char *str;
-	char path[PATH_MAX];
-
-	if (!(cn = find_config_node(cmd->cft->root, "activation/volume_list"))) {
-		/* If no hosts tags defined, activate */
-		if (list_empty(&cmd->tags))
-			return 1;
-
-		/* If any host tag matches any LV or VG tag, activate */
-		if (str_list_match_list(&cmd->tags, &lv->tags) ||
-		    str_list_match_list(&cmd->tags, &lv->vg->tags))
-			return 1;
-
-		/* Don't activate */
-		return 0;
-	}
-
-	for (cv = cn->v; cv; cv = cv->next) {
-		if (cv->type != CFG_STRING) {
-			log_error("Ignoring invalid string in config file "
-				  "activation/volume_list");
-			continue;
-		}
-		str = cv->v.str;
-		if (!*str) {
-			log_error("Ignoring empty string in config file "
-				  "activation/volume_list");
-			continue;
-		}
-
-		/* Tag? */
-		if (*str == '@') {
-			str++;
-			if (!*str) {
-				log_error("Ignoring empty tag in config file "
-					  "activation/volume_list");
-				continue;
-			}
-			/* If any host tag matches any LV or VG tag, activate */
-			if (!strcmp(str, "*")) {
-				if (str_list_match_list(&cmd->tags, &lv->tags)
-				    || str_list_match_list(&cmd->tags,
-							   &lv->vg->tags))
-					    return 1;
-				else
-					continue;
-			}
-			/* If supplied tag matches LV or VG tag, activate */
-			if (str_list_match_item(&lv->tags, str) ||
-			    str_list_match_item(&lv->vg->tags, str))
-				return 1;
-			else
-				continue;
-		}
-		if (!index(str, '/')) {
-			/* vgname supplied */
-			if (!strcmp(str, lv->vg->name))
-				return 1;
-			else
-				continue;
-		}
-		/* vgname/lvname */
-		if (lvm_snprintf(path, sizeof(path), "%s/%s", lv->vg->name,
-				 lv->name) < 0) {
-			log_error("lvm_snprintf error from %s/%s", lv->vg->name,
-				  lv->name);
-			continue;
-		}
-		if (!strcmp(path, str))
-			return 1;
-	}
-
-	return 0;
-}
-
-int library_version(char *version, size_t size)
-{
-	if (!activation())
-		return 0;
-
-	if (!dm_get_library_version(version, size))
-		return 0;
-	return 1;
-}
-
-int driver_version(char *version, size_t size)
-{
-	int r = 0;
+	char name[128];
 	struct dm_task *dmt;
 
-	if (!activation())
-		return 0;
-
-	log_very_verbose("Getting driver version");
-	if (!(dmt = dm_task_create(DM_DEVICE_VERSION))) {
+	if (!(dmt = dm_task_create(task))) {
 		stack;
-		return 0;
+		return NULL;
 	}
 
-	if (!dm_task_run(dmt))
-		log_error("Failed to get driver version");
+	_build_lv_name(name, sizeof(name), lv);
+	dm_task_set_name(dmt, name);
 
-	if (!dm_task_get_driver_version(dmt, version, size))
-		goto out;
-
-	r = 1;
-
-      out:
-	dm_task_destroy(dmt);
-
-	return r;
+	return dmt;
 }
 
-int target_present(const char *target_name)
+int lv_info(struct logical_volume *lv, struct dm_info *info)
 {
 	int r = 0;
 	struct dm_task *dmt;
-	struct dm_versions *target, *last_target;
 
-	if (!activation())
-		return 0;
-
-	log_very_verbose("Getting target version for %s", target_name);
-	if (!(dmt = dm_task_create(DM_DEVICE_LIST_VERSIONS))) {
+	if (!(dmt = _setup_task(lv, DM_DEVICE_INFO))) {
 		stack;
 		return 0;
 	}
 
 	if (!dm_task_run(dmt)) {
-		log_debug("Failed to get %s target version", target_name);
-		/* Assume this was because LIST_VERSIONS isn't supported */
-		return 1;
+		stack;
+		goto out;
 	}
 
-	target = dm_task_get_versions(dmt);
+	if (!dm_task_get_info(dmt, info)) {
+		stack;
+		goto out;
+	}
+	r = 1;
 
-	do {
-		last_target = target;
-
-		if (!strcmp(target_name, target->name)) {
-			r = 1;
-			goto out;
-		}
-
-		target = (void *) target + target->next;
-	} while (last_target != target);
-
-      out:
+ out:
 	dm_task_destroy(dmt);
-
 	return r;
 }
 
-/*
- * Returns 1 if info structure populated, else 0 on failure.
- */
-static int _lv_info(const struct logical_volume *lv, int mknodes,
-		    struct lvinfo *info)
+int lv_active(struct logical_volume *lv)
 {
-	int r;
-	struct dev_manager *dm;
-	struct dm_info dminfo;
-
-	if (!activation())
-		return 0;
-
-	if (!(dm = dev_manager_create(lv->vg->name, lv->vg->cmd->cft))) {
-		stack;
-		return 0;
-	}
-
-	if (!(r = dev_manager_info(dm, lv, mknodes, &dminfo)))
-		stack;
-
-	info->exists = dminfo.exists;
-	info->suspended = dminfo.suspended;
-	info->open_count = dminfo.open_count;
-	info->major = dminfo.major;
-	info->minor = dminfo.minor;
-	info->read_only = dminfo.read_only;
-
-	dev_manager_destroy(dm);
-	return r;
-}
-
-int lv_info(const struct logical_volume *lv, struct lvinfo *info)
-{
-	return _lv_info(lv, 0, info);
-}
-
-int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s,
-		    struct lvinfo *info)
-{
-	struct logical_volume *lv;
-
-	if (!(lv = lv_from_lvid(cmd, lvid_s)))
-		return 0;
-
-	return _lv_info(lv, 0, info);
-}
-
-/*
- * Returns 1 if percent set, else 0 on failure.
- */
-int lv_snapshot_percent(struct logical_volume *lv, float *percent)
-{
-	int r;
-	struct dev_manager *dm;
-
-	if (!activation())
-		return 0;
-
-	if (!(dm = dev_manager_create(lv->vg->name, lv->vg->cmd->cft))) {
-		stack;
-		return 0;
-	}
-
-	if (!(r = dev_manager_snapshot_percent(dm, lv, percent)))
-		stack;
-
-	dev_manager_destroy(dm);
-
-	return r;
-}
-
-/* FIXME Merge with snapshot_percent */
-int lv_mirror_percent(struct logical_volume *lv, int wait, float *percent,
-		      uint32_t *event_nr)
-{
-	int r;
-	struct dev_manager *dm;
-	struct lvinfo info;
-
-	if (!activation())
-		return 0;
+	int r = -1;
+	struct dm_info info;
 
 	if (!lv_info(lv, &info)) {
 		stack;
-		return 0;
-	}
-
-	if (!info.exists)
-		return 0;
-
-	if (!(dm = dev_manager_create(lv->vg->name, lv->vg->cmd->cft))) {
-		stack;
-		return 0;
-	}
-
-	if (!(r = dev_manager_mirror_percent(dm, lv, wait, percent, event_nr)))
-		stack;
-
-	dev_manager_destroy(dm);
-
-	return r;
-}
-
-static int _lv_active(struct logical_volume *lv)
-{
-	struct lvinfo info;
-
-	if (!lv_info(lv, &info)) {
-		stack;
-		return -1;
+		return r;
 	}
 
 	return info.exists;
 }
 
-static int _lv_open_count(struct logical_volume *lv)
+int lv_open_count(struct logical_volume *lv)
 {
-	struct lvinfo info;
+	int r = -1;
+	struct dm_info info;
 
 	if (!lv_info(lv, &info)) {
 		stack;
-		return -1;
+		return r;
 	}
 
 	return info.open_count;
 }
 
-/* FIXME Need to detect and handle an lv rename */
-static int _lv_activate_lv(struct logical_volume *lv)
-{
-	int r;
-	struct dev_manager *dm;
-
-	if (!(dm = dev_manager_create(lv->vg->name, lv->vg->cmd->cft))) {
-		stack;
-		return 0;
-	}
-
-	if (!(r = dev_manager_activate(dm, lv)))
-		stack;
-
-	dev_manager_destroy(dm);
-	return r;
-}
-
-static int _lv_deactivate(struct logical_volume *lv)
-{
-	int r;
-	struct dev_manager *dm;
-
-	if (!(dm = dev_manager_create(lv->vg->name, lv->vg->cmd->cft))) {
-		stack;
-		return 0;
-	}
-
-	if (!(r = dev_manager_deactivate(dm, lv)))
-		stack;
-
-	dev_manager_destroy(dm);
-	return r;
-}
-
-static int _lv_suspend_lv(struct logical_volume *lv)
-{
-	int r;
-	struct dev_manager *dm;
-
-	if (!(dm = dev_manager_create(lv->vg->name, lv->vg->cmd->cft))) {
-		stack;
-		return 0;
-	}
-
-	if (!(r = dev_manager_suspend(dm, lv)))
-		stack;
-
-	dev_manager_destroy(dm);
-	return r;
-}
-
 /*
- * These two functions return the number of LVs in the state,
- * or -1 on error.
+ * Creates a target for the next contiguous run of
+ * extents.
  */
+static int _emit_target(struct dm_task *dmt, struct logical_volume *lv,
+			unsigned int *ple)
+{
+	char params[1024];
+	unsigned int le = *ple;
+	uint64_t esize = lv->vg->extent_size;
+	int i, count = 0;
+	struct pe_specifier *pes, *first = NULL;
+
+	for (i = le; i < lv->le_count; i++) {
+		pes = lv->map + i;
+
+		if (!first)
+			first = pes;
+
+		/*
+		 * check that we're still contiguous.
+		 */
+		else if ((pes->pv != first->pv) ||
+			 (pes->pe != first->pe + count))
+				break;
+
+		count++;
+	}
+
+	snprintf(params, sizeof(params), "%s %" PRIu64,
+		 dev_name(first->pv->dev),
+		 first->pv->pe_start + (esize * first->pe));
+
+	if (!dm_task_add_target(dmt, esize * le, esize * count,
+				"linear", params)) {
+		stack;
+		return 0;
+	}
+
+	*ple = i;
+	return 1;
+}
+
+int _load(struct logical_volume *lv, int task)
+{
+	int r = 0;
+	uint32_t le = 0;
+	struct dm_task *dmt;
+
+	if (!(dmt = _setup_task(lv, task))) {
+		stack;
+		return 0;
+	}
+
+	/*
+	 * Merge adjacent extents.
+	 */
+	while (le < lv->le_count) {
+		if (!_emit_target(dmt, lv, &le)) {
+			log_error("Unable to activate logical volume '%s'",
+				lv->name);
+			goto out;
+		}
+	}
+
+	if (!(r = dm_task_run(dmt)))
+		stack;
+
+	log_verbose("Logical volume %s activated", lv->name);
+
+ out:
+	dm_task_destroy(dmt);
+	return r;
+}
+
+/* FIXME: Always display error msg */
+int lv_activate(struct logical_volume *lv)
+{
+	return _load(lv, DM_DEVICE_CREATE) && fs_add_lv(lv);
+}
+
+int _suspend(struct logical_volume *lv, int sus)
+{
+	int r;
+	struct dm_task *dmt;
+	int task = sus ? DM_DEVICE_SUSPEND : DM_DEVICE_RESUME;
+
+	if (!(dmt = _setup_task(lv, task))) {
+		stack;
+		return 0;
+	}
+
+	if (!(r = dm_task_run(dmt)))
+		log_err("Couldn't %s device '%s'", sus ? "suspend" : "resume",
+			lv->name);
+
+	dm_task_destroy(dmt);
+	return r;
+}
+
+int lv_reactivate(struct logical_volume *lv)
+{
+	int r;
+	if (!_suspend(lv, 1)) {
+		stack;
+		return 0;
+	}
+
+	r = _load(lv, DM_DEVICE_RELOAD);
+
+	if (!_suspend(lv, 0)) {
+		stack;
+		return 0;
+	}
+
+	return r;
+}
+
+int lv_deactivate(struct logical_volume *lv)
+{
+	int r;
+	struct dm_task *dmt;
+
+	if (!(dmt = _setup_task(lv, DM_DEVICE_REMOVE))) {
+		stack;
+		return 0;
+	}
+
+	if (!(r = dm_task_run(dmt)))
+		stack;
+
+	dm_task_destroy(dmt);
+
+	fs_del_lv(lv);
+
+	return r;
+}
+
+int lv_suspend(struct logical_volume *lv, int sus)
+{
+    return _suspend(lv, sus);
+}
+
+int suspend_lvs_in_vg(struct volume_group *vg, int sus)
+{
+	struct list *lvh;
+	struct logical_volume *lv;
+	int count = 0;
+
+	list_iterate(lvh, &vg->lvs) {
+		lv = &(list_item(lvh, struct lv_list)->lv);
+
+		count += (_suspend(lv, sus));
+	}
+
+	return count;
+}
+
+
+int activate_lvs_in_vg(struct volume_group *vg)
+{
+	struct list *lvh;
+	struct logical_volume *lv;
+	int count = 0;
+
+	list_iterate(lvh, &vg->lvs) {
+		lv = &(list_item(lvh, struct lv_list)->lv);
+
+		count += (!lv_active(lv) && lv_activate(lv));
+	}
+
+	return count;
+}
+
+int lv_update_write_access(struct logical_volume *lv)
+{
+	return 0;
+}
+
+int deactivate_lvs_in_vg(struct volume_group *vg)
+{
+	struct list *lvh;
+	struct logical_volume *lv;
+	int count = 0;
+
+	list_iterate(lvh, &vg->lvs) {
+		lv = &(list_item(lvh, struct lv_list)->lv);
+
+		count += ((lv_active(lv) == 1) && lv_deactivate(lv));
+	}
+
+	return count;
+}
+
 int lvs_in_vg_activated(struct volume_group *vg)
 {
 	struct list *lvh;
 	struct logical_volume *lv;
 	int count = 0;
 
-	if (!activation())
-		return 0;
-
 	list_iterate(lvh, &vg->lvs) {
-		lv = list_item(lvh, struct lv_list)->lv;
-		count += (_lv_active(lv) == 1);
+		lv = &(list_item(lvh, struct lv_list)->lv);
+
+		count += (lv_active(lv) == 1);
 	}
 
 	return count;
@@ -518,250 +298,12 @@ int lvs_in_vg_opened(struct volume_group *vg)
 	struct logical_volume *lv;
 	int count = 0;
 
-	if (!activation())
-		return 0;
-
 	list_iterate(lvh, &vg->lvs) {
-		lv = list_item(lvh, struct lv_list)->lv;
-		count += (_lv_open_count(lv) == 1);
+		lv = &(list_item(lvh, struct lv_list)->lv);
+
+		count += (lv_open_count(lv) == 1);
 	}
 
 	return count;
 }
 
-static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
-		       int error_if_not_suspended)
-{
-	struct logical_volume *lv;
-	struct lvinfo info;
-
-	if (!activation())
-		return 1;
-
-	if (!(lv = lv_from_lvid(cmd, lvid_s)))
-		return 0;
-
-	if (test_mode()) {
-		_skip("Suspending '%s'.", lv->name);
-		return 1;
-	}
-
-	if (!lv_info(lv, &info)) {
-		stack;
-		return 0;
-	}
-
-	if (!info.exists || info.suspended)
-		return error_if_not_suspended ? 0 : 1;
-
-	memlock_inc();
-	if (!_lv_suspend_lv(lv)) {
-		memlock_dec();
-		fs_unlock();
-		return 0;
-	}
-
-	return 1;
-}
-
-/* Returns success if the device is not active */
-int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s)
-{
-	return _lv_suspend(cmd, lvid_s, 0);
-}
-
-int lv_suspend(struct cmd_context *cmd, const char *lvid_s)
-{
-	return _lv_suspend(cmd, lvid_s, 1);
-}
-
-static int _lv_resume(struct cmd_context *cmd, const char *lvid_s,
-		      int error_if_not_active)
-{
-	struct logical_volume *lv;
-	struct lvinfo info;
-
-	if (!activation())
-		return 1;
-
-	if (!(lv = lv_from_lvid(cmd, lvid_s)))
-		return 0;
-
-	if (test_mode()) {
-		_skip("Resuming '%s'.", lv->name);
-		return 1;
-	}
-
-	if (!lv_info(lv, &info)) {
-		stack;
-		return 0;
-	}
-
-	if (!info.exists || !info.suspended)
-		return error_if_not_active ? 0 : 1;
-
-	if (!_lv_activate_lv(lv))
-		return 0;
-
-	memlock_dec();
-	fs_unlock();
-
-	return 1;
-}
-
-/* Returns success if the device is not active */
-int lv_resume_if_active(struct cmd_context *cmd, const char *lvid_s)
-{
-	return _lv_resume(cmd, lvid_s, 0);
-}
-
-int lv_resume(struct cmd_context *cmd, const char *lvid_s)
-{
-	return _lv_resume(cmd, lvid_s, 1);
-}
-
-int lv_deactivate(struct cmd_context *cmd, const char *lvid_s)
-{
-	struct logical_volume *lv;
-	struct lvinfo info;
-	int r;
-
-	if (!activation())
-		return 1;
-
-	if (!(lv = lv_from_lvid(cmd, lvid_s)))
-		return 0;
-
-	if (test_mode()) {
-		_skip("Deactivating '%s'.", lv->name);
-		return 1;
-	}
-
-	if (!lv_info(lv, &info)) {
-		stack;
-		return 0;
-	}
-
-	if (!info.exists)
-		return 1;
-
-	if (info.open_count && (lv->status & VISIBLE_LV)) {
-		log_error("LV %s/%s in use: not removing", lv->vg->name,
-			  lv->name);
-		return 0;
-	}
-
-	memlock_inc();
-	r = _lv_deactivate(lv);
-	memlock_dec();
-	fs_unlock();
-
-	return r;
-}
-
-/* Test if LV passes filter */
-int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s,
-			 int *activate_lv)
-{
-	struct logical_volume *lv;
-
-	if (!activation())
-		goto activate;
-
-	if (!(lv = lv_from_lvid(cmd, lvid_s)))
-		return 0;
-
-	if (!_passes_activation_filter(cmd, lv)) {
-		log_verbose("Not activating %s/%s due to config file settings",
-			    lv->vg->name, lv->name);
-		*activate_lv = 0;
-		return 1;
-	}
-
-      activate:
-	*activate_lv = 1;
-	return 1;
-}
-
-static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, int filter)
-{
-	struct logical_volume *lv;
-	struct lvinfo info;
-	int r;
-
-	if (!activation())
-		return 1;
-
-	if (!(lv = lv_from_lvid(cmd, lvid_s)))
-		return 0;
-
-	if (filter && !_passes_activation_filter(cmd, lv)) {
-		log_verbose("Not activating %s/%s due to config file settings",
-			    lv->vg->name, lv->name);
-		return 0;
-	}
-
-	if (test_mode()) {
-		_skip("Activating '%s'.", lv->name);
-		return 1;
-	}
-
-	if (!lv_info(lv, &info)) {
-		stack;
-		return 0;
-	}
-
-	if (info.exists && !info.suspended)
-		return 1;
-
-	memlock_inc();
-	r = _lv_activate_lv(lv);
-	memlock_dec();
-	fs_unlock();
-
-	return r;
-}
-
-/* Activate LV */
-int lv_activate(struct cmd_context *cmd, const char *lvid_s)
-{
-	return _lv_activate(cmd, lvid_s, 0);
-}
-
-/* Activate LV only if it passes filter */
-int lv_activate_with_filter(struct cmd_context *cmd, const char *lvid_s)
-{
-	return _lv_activate(cmd, lvid_s, 1);
-}
-
-int lv_mknodes(struct cmd_context *cmd, const struct logical_volume *lv)
-{
-	struct lvinfo info;
-	int r = 1;
-
-	if (!lv) {
-		r = dev_manager_mknodes();
-		fs_unlock();
-		return r;
-	}
-
-	if (!_lv_info(lv, 1, &info)) {
-		stack;
-		return 0;
-	}
-
-	if (info.exists)
-		r = dev_manager_lv_mknodes(lv);
-	else
-		r = dev_manager_lv_rmnodes(lv);
-
-	fs_unlock();
-
-	return r;
-}
-
-void activation_exit(void)
-{
-	dev_manager_exit();
-}
-#endif

lib/activate/activate.h

@@ -1,82 +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>
 
-#ifdef DEVMAPPER_SUPPORT
-#  include <libdevmapper.h>
-#endif
+/* FIXME Snapshot handling? */
 
-struct lvinfo {
-	int exists;
-	int suspended;
-	unsigned int open_count;
-	int major;
-	int minor;
-	int read_only;
-};
+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);
 
-void set_activation(int activation);
-int activation(void);
-
-int driver_version(char *version, size_t size);
-int library_version(char *version, size_t size);
-
-int target_present(const char *target_name);
-
-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 lv_activate_with_filter(struct cmd_context *cmd, const char *lvid_s);
-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(const struct logical_volume *lv, struct lvinfo *info);
-int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s,
-		    struct lvinfo *info);
-
-/*
- * 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(struct logical_volume *lv, float *percent);
-int lv_mirror_percent(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 lv_setup_cow_store(struct logical_volume *lv);
+/*
+ * Test for (lv->status & LVM_WRITE)
+ */
+int lv_update_write_access(struct logical_volume *lv);
+
+/*
+ * Activate all LVs in the VG.  Ignore any that
+ * are already active.  Return number
+ * activated.
+ */
+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,59 +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
-
-#include "metadata.h"
-#include "config.h"
-
-struct dev_manager;
-struct dm_info;
-
-/*
- * Constructor and destructor.
- */
-struct dev_manager *dev_manager_create(const char *vg_name,
-				       struct config_tree *cf);
-void dev_manager_destroy(struct dev_manager *dm);
-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 dev_manager *dm, const struct logical_volume *lv,
-		     int mknodes, struct dm_info *info);
-int dev_manager_snapshot_percent(struct dev_manager *dm,
-				 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 dev_manager_activate(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);
-int dev_manager_mknodes(void);
-
-/*
- * Put the desired changes into effect.
- */
-int dev_manager_execute(struct dev_manager *dm);
-
-#endif

lib/activate/dmfs-driver.h

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2001 Sistina Software (UK) Limited.
+ *
+ * This file is released under the GPL.
+ */
+
+#ifndef DMFS_INTERFACE_H
+#define DMFS_INTERFACE_H
+
+struct dmfs;
+
+struct dmfs *dmfs_create(void);
+void dmfs_destroy(struct dmfs *dm);
+
+int dmfs_dev_is_present(struct dmfs *dm, const char *dev);
+int dmfs_dev_is_active(struct dmfs *dm, const char *dev);
+
+int dmfs_table_is_present(struct dmfs *dm, const char *dev, const char *table);
+int dmfs_table_is_active(struct dmfs *dm, const char *dev, const char *table);
+
+int dmfs_dev_create(struct dmfs *dm, const char *name);
+int dmfs_dev_load_table(struct dmfs *dm, const char *dev, 
+			const char *table, const char *file);
+int dmfs_dev_drop_table(struct dmfs *dm, const char *dev, const char *table);
+
+int dmfs_dev_activate_table(struct dmfs *dm, const char *dev,
+			    const char *table);
+
+int dmfs_dev_deactivate(struct dmfs *dm, const char *dev);
+
+#endif

lib/activate/fs.c

@@ -1,203 +1,112 @@
 /*
- * 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 LGPL.
  */
 
-#include "lib.h"
-#include "fs.h"
-#include "toolcontext.h"
-#include "lvm-string.h"
-#include "lvm-file.h"
-#include "memlock.h"
-
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <limits.h>
-#include <dirent.h>
-#include <libdevmapper.h>
+#include <stdio.h>
+#include <string.h>
 
-static int _mk_dir(const char *dev_dir, const char *vg_name)
+#include "fs.h"
+#include "log.h"
+
+#include <devmapper/libdevmapper.h>
+
+/*
+ * FIXME: copied straight from LVM1.
+ *
+ * This should run through /proc/mounts once only,
+ * storing devfs mount points in a hash table.
+ */
+static int _check_devfs(const char *dev_dir)
 {
-	char vg_path[PATH_MAX];
+	int r = 0, len;
+	char dir[PATH_MAX], line[512];
+	char type[32];
+	FILE *mounts = NULL;
 
-	if (lvm_snprintf(vg_path, sizeof(vg_path), "%s%s",
-			 dev_dir, vg_name) == -1) {
-		log_error("Couldn't construct name of volume "
-			  "group directory.");
-		return 0;
+	if (!(mounts = fopen("/proc/mounts", "r")))
+		goto out;
+
+	/* trim the trailing slash off dev_dir, yuck */
+	len = strlen(dev_dir) - 1;
+	while(len && dev_dir[len] == '/')
+		len--;
+
+	while (!feof(mounts)) {
+		fgets(line, sizeof(line) - 1, mounts);
+		if (sscanf(line, "%*s %s %s %*s", dir, type) != 2)
+			continue;
+
+		if (!strcmp(type, "devfs") && !strncmp(dir, dev_dir, len)) {
+			r = 1;
+			break;
+		}
 	}
+	fclose(mounts);
 
-	if (dir_exists(vg_path))
+ out:
+	return r;
+}
+
+void _build_lv_path(char *buffer, size_t len, struct logical_volume *lv)
+{
+	snprintf(buffer, len, "%s%s/%s_%s",
+		 lv->vg->cmd->dev_dir, dm_dir(), lv->vg->name, lv->name);
+}
+
+void _build_vg_path(char *buffer, size_t len, struct volume_group *vg)
+{
+	snprintf(buffer, len, "%s/%s", vg->cmd->dev_dir, vg->name);
+}
+
+void _build_link_path(char *buffer, size_t len, struct logical_volume *lv)
+{
+	snprintf(buffer, len, "%s/%s/%s", lv->vg->cmd->dev_dir,
+		 lv->vg->name, lv->name);
+}
+
+static int _mk_node(struct logical_volume *lv)
+{
+	char lv_path[PATH_MAX];
+	char dm_path[PATH_MAX];
+	dev_t dev;
+	const char *dev_dir = lv->vg->cmd->dev_dir;
+
+	if (_check_devfs(dev_dir))
 		return 1;
 
-	log_very_verbose("Creating directory %s", vg_path);
-	if (mkdir(vg_path, 0555)) {
-		log_sys_error("mkdir", vg_path);
+	snprintf(dm_path, PATH_MAX, "%s%s", dev_dir, dm_dir());
+	if (mkdir(dm_path, 0555) && errno != EEXIST) {
+		log_sys_error("mkdir", dm_path);
+		return 0;
+	}
+
+	_build_lv_path(lv_path, sizeof(lv_path), lv);
+
+	if (mknod(lv_path, S_IFBLK | S_IRUSR | S_IWUSR | S_IRGRP, dev) < 0) {
+		log_sys_error("mknod", lv_path);
 		return 0;
 	}
 
 	return 1;
 }
 
-static int _rm_dir(const char *dev_dir, const char *vg_name)
+static int _rm_node(struct logical_volume *lv)
 {
-	char vg_path[PATH_MAX];
-
-	if (lvm_snprintf(vg_path, sizeof(vg_path), "%s%s",
-			 dev_dir, vg_name) == -1) {
-		log_error("Couldn't construct name of volume "
-			  "group directory.");
-		return 0;
-	}
-
-	log_very_verbose("Removing directory %s", vg_path);
-
-	if (is_empty_dir(vg_path))
-		rmdir(vg_path);
-
-	return 1;
-}
-
-static void _rm_blks(const char *dir)
-{
-	const char *name;
-	char path[PATH_MAX];
-	struct dirent *dirent;
-	struct stat buf;
-	DIR *d;
-
-	if (!(d = opendir(dir))) {
-		log_sys_error("opendir", dir);
-		return;
-	}
-
-	while ((dirent = readdir(d))) {
-		name = dirent->d_name;
-
-		if (!strcmp(name, ".") || !strcmp(name, ".."))
-			continue;
-
-		if (lvm_snprintf(path, sizeof(path), "%s/%s", dir, name) == -1) {
-			log_error("Couldn't create path for %s", name);
-			continue;
-		}
-
-		if (!lstat(path, &buf)) {
-			if (!S_ISBLK(buf.st_mode))
-				continue;
-			log_very_verbose("Removing %s", path);
-			if (unlink(path) < 0)
-				log_sys_error("unlink", path);
-		}
-	}
-}
-
-static int _mk_link(const char *dev_dir, const char *vg_name,
-		    const char *lv_name, const char *dev)
-{
-	char lv_path[PATH_MAX], link_path[PATH_MAX], lvm1_group_path[PATH_MAX];
-	char vg_path[PATH_MAX];
-	struct stat buf;
-
-	if (lvm_snprintf(vg_path, sizeof(vg_path), "%s%s",
-			 dev_dir, vg_name) == -1) {
-		log_error("Couldn't create path for volume group dir %s",
-			  vg_name);
-		return 0;
-	}
-
-	if (lvm_snprintf(lv_path, sizeof(lv_path), "%s/%s", vg_path,
-			 lv_name) == -1) {
-		log_error("Couldn't create source pathname for "
-			  "logical volume link %s", lv_name);
-		return 0;
-	}
-
-	if (lvm_snprintf(link_path, sizeof(link_path), "%s/%s",
-			 dm_dir(), dev) == -1) {
-		log_error("Couldn't create destination pathname for "
-			  "logical volume link for %s", lv_name);
-		return 0;
-	}
-
-	if (lvm_snprintf(lvm1_group_path, sizeof(lvm1_group_path), "%s/group",
-			 vg_path) == -1) {
-		log_error("Couldn't create pathname for LVM1 group file for %s",
-			  vg_name);
-		return 0;
-	}
-
-	/* To reach this point, the VG must have been locked.
-	 * As locking fails if the VG is active under LVM1, it's 
-	 * now safe to remove any LVM1 devices we find here
-	 * (as well as any existing LVM2 symlink). */
-	if (!lstat(lvm1_group_path, &buf)) {
-		if (!S_ISCHR(buf.st_mode)) {
-			log_error("Non-LVM1 character device found at %s",
-				  lvm1_group_path);
-		} else {
-			_rm_blks(vg_path);
-
-			log_very_verbose("Removing %s", lvm1_group_path);
-			if (unlink(lvm1_group_path) < 0)
-				log_sys_error("unlink", lvm1_group_path);
-		}
-	}
-
-	if (!lstat(lv_path, &buf)) {
-		if (!S_ISLNK(buf.st_mode) && !S_ISBLK(buf.st_mode)) {
-			log_error("Symbolic link %s not created: file exists",
-				  link_path);
-			return 0;
-		}
-
-		log_very_verbose("Removing %s", lv_path);
-		if (unlink(lv_path) < 0) {
-			log_sys_error("unlink", lv_path);
-			return 0;
-		}
-	}
-
-	log_very_verbose("Linking %s -> %s", lv_path, link_path);
-	if (symlink(link_path, lv_path) < 0) {
-		log_sys_error("symlink", lv_path);
-		return 0;
-	}
-
-	return 1;
-}
-
-static int _rm_link(const char *dev_dir, const char *vg_name,
-		    const char *lv_name)
-{
-	struct stat buf;
 	char lv_path[PATH_MAX];
+	const char *dev_dir = lv->vg->cmd->dev_dir;
 
-	if (lvm_snprintf(lv_path, sizeof(lv_path), "%s%s/%s",
-			 dev_dir, vg_name, lv_name) == -1) {
-		log_error("Couldn't determine link pathname.");
-		return 0;
-	}
+	if (_check_devfs(dev_dir))
+		return 1;
 
-	if (lstat(lv_path, &buf) || !S_ISLNK(buf.st_mode)) {
-		if (errno != ENOENT)
-			log_error("%s not symbolic link - not removing",
-				  lv_path);
-		return 0;
-	}
+	_build_lv_path(lv_path, sizeof(lv_path), lv);
 
-	log_very_verbose("Removing link %s", lv_path);
 	if (unlink(lv_path) < 0) {
 		log_sys_error("unlink", lv_path);
 		return 0;
@@ -206,143 +115,95 @@ static int _rm_link(const char *dev_dir, const char *vg_name,
 	return 1;
 }
 
-typedef enum {
-	FS_ADD,
-	FS_DEL,
-	FS_RENAME
-} fs_op_t;
-
-static int _do_fs_op(fs_op_t type, const char *dev_dir, const char *vg_name,
-		     const char *lv_name, const char *dev,
-		     const char *old_lv_name)
+/*
+ * Lazy programmer: I'm just going to always try
+ * and create/remove the vg directory, and not say
+ * anything if it fails.
+ */
+static int _mk_dir(struct volume_group *vg)
 {
-	switch (type) {
-	case FS_ADD:
-		if (!_mk_dir(dev_dir, vg_name) ||
-		    !_mk_link(dev_dir, vg_name, lv_name, dev)) {
-			stack;
-			return 0;
-		}
-		break;
-	case FS_DEL:
-		if (!_rm_link(dev_dir, vg_name, lv_name) ||
-		    !_rm_dir(dev_dir, vg_name)) {
-			stack;
-			return 0;
-		}
-		break;
-		/* FIXME Use rename() */
-	case FS_RENAME:
-		if (old_lv_name && !_rm_link(dev_dir, vg_name, old_lv_name))
-			stack;
-
-		if (!_mk_link(dev_dir, vg_name, lv_name, dev))
-			stack;
-	}
+	char vg_path[PATH_MAX];
 
+	_build_vg_path(vg_path, sizeof(vg_path), vg);
+	mkdir(vg_path, 0555);
 	return 1;
 }
 
-static LIST_INIT(_fs_ops);
-
-struct fs_op_parms {
-	struct list list;
-	fs_op_t type;
-	char *dev_dir;
-	char *vg_name;
-	char *lv_name;
-	char *dev;
-	char *old_lv_name;
-	char names[0];
-};
-
-static void _store_str(char **pos, char **ptr, const char *str)
+static int _rm_dir(struct volume_group *vg)
 {
-	strcpy(*pos, str);
-	*ptr = *pos;
-	*pos += strlen(*ptr) + 1;
+	char vg_path[PATH_MAX];
+
+	_build_vg_path(vg_path, sizeof(vg_path), vg);
+	rmdir(vg_path);
+	return 1;
 }
 
-static int _stack_fs_op(fs_op_t type, const char *dev_dir, const char *vg_name,
-			const char *lv_name, const char *dev,
-			const char *old_lv_name)
+static int _mk_link(struct logical_volume *lv)
 {
-	struct fs_op_parms *fsp;
-	size_t len = strlen(dev_dir) + strlen(vg_name) + strlen(lv_name) +
-	    strlen(dev) + strlen(old_lv_name) + 5;
-	char *pos;
+	char lv_path[PATH_MAX], link_path[PATH_MAX];
 
-	if (!(fsp = dbg_malloc(sizeof(*fsp) + len))) {
-		log_error("No space to stack fs operation");
+	_build_lv_path(lv_path, sizeof(lv_path), lv);
+	_build_link_path(link_path, sizeof(link_path), lv);
+
+	if (symlink(lv_path, link_path) < 0) {
+		log_sys_error("symlink", link_path);
 		return 0;
 	}
 
-	pos = fsp->names;
-	fsp->type = type;
+	return 1;
+}
 
-	_store_str(&pos, &fsp->dev_dir, dev_dir);
-	_store_str(&pos, &fsp->vg_name, vg_name);
-	_store_str(&pos, &fsp->lv_name, lv_name);
-	_store_str(&pos, &fsp->dev, dev);
-	_store_str(&pos, &fsp->old_lv_name, old_lv_name);
+static int _rm_link(struct logical_volume *lv)
+{
+	char link_path[PATH_MAX];
 
-	list_add(&_fs_ops, &fsp->list);
+	_build_link_path(link_path, sizeof(link_path), lv);
+
+	if (unlink(link_path) < 0) {
+		log_sys_error("unlink", link_path);
+		return 0;
+	}
 
 	return 1;
 }
 
-static void _pop_fs_ops(void)
+int fs_add_lv(struct logical_volume *lv)
 {
-	struct list *fsph, *fspht;
-	struct fs_op_parms *fsp;
-
-	list_iterate_safe(fsph, fspht, &_fs_ops) {
-		fsp = list_item(fsph, struct fs_op_parms);
-		_do_fs_op(fsp->type, fsp->dev_dir, fsp->vg_name, fsp->lv_name,
-			  fsp->dev, fsp->old_lv_name);
-		list_del(&fsp->list);
-		dbg_free(fsp);
-	}
-}
-
-static int _fs_op(fs_op_t type, const char *dev_dir, const char *vg_name,
-		  const char *lv_name, const char *dev, const char *old_lv_name)
-{
-	if (memlock()) {
-		if (!_stack_fs_op(type, dev_dir, vg_name, lv_name, dev,
-				  old_lv_name)) {
-			stack;
-			return 0;
-		}
-		return 1;
+	if (!_mk_node(lv)) {
+		stack;
+		return 0;
 	}
 
-	return _do_fs_op(type, dev_dir, vg_name, lv_name, dev, old_lv_name);
-}
-
-int fs_add_lv(const struct logical_volume *lv, const char *dev)
-{
-	return _fs_op(FS_ADD, lv->vg->cmd->dev_dir, lv->vg->name, lv->name,
-		      dev, "");
-}
-
-int fs_del_lv(const struct logical_volume *lv)
-{
-	return _fs_op(FS_DEL, lv->vg->cmd->dev_dir, lv->vg->name, lv->name,
-		      "", "");
-}
-
-int fs_rename_lv(struct logical_volume *lv,
-		 const char *dev, const char *old_name)
-{
-	return _fs_op(FS_RENAME, lv->vg->cmd->dev_dir, lv->vg->name, lv->name,
-		      dev, old_name);
-}
-
-void fs_unlock(void)
-{
-	if (!memlock()) {
-		dm_lib_release();
-		_pop_fs_ops();
+	if (!_mk_dir(lv->vg)) {
+		stack;
+		return 0;
 	}
+
+	if (!_mk_link(lv)) {
+		stack;
+		return 0;
+	}
+
+	return 1;
 }
+
+int fs_del_lv(struct logical_volume *lv)
+{
+	if (!_rm_link(lv)) {
+		stack;
+		return 0;
+	}
+
+	if (!_rm_dir(lv->vg)) {
+		stack;
+		return 0;
+	}
+
+	if (!_rm_node(lv)) {
+		stack;
+		return 0;
+	}
+
+	return 1;
+}
+

lib/activate/fs.h

@@ -1,16 +1,7 @@
 /*
- * 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 LGPL.
  */
 
 #ifndef _LVM_FS_H
@@ -18,15 +9,7 @@
 
 #include "metadata.h"
 
-/*
- * These calls, private to the activate unit, set
- * up the volume group directory in /dev and the
- * symbolic links to the dm device.
- */
-int fs_add_lv(const struct logical_volume *lv, const char *dev);
-int fs_del_lv(const struct logical_volume *lv);
-int fs_rename_lv(struct logical_volume *lv,
-		 const char *dev, const char *old_name);
-void fs_unlock(void);
+int fs_add_lv(struct logical_volume *lv);
+int fs_del_lv(struct logical_volume *lv);
 
 #endif

lib/activate/table-build.c

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2001 Sistina Software (UK) Limited.
+ *
+ * This file is released under the LGPL.
+ */
+
+#include "table-build.c"
+
+static void _print_run(FILE *fp, struct logical_volume *lv)
+{
+
+}
+
+
+int build_table(struct volume_group *vg, struct logical_volume *lv,
+		const char *file)
+{
+	int i;
+	uint64_t sector = 0;
+	uint64_t pe_size = vg->extent_size;
+	uint64_t dest;
+	struct pe_specifier *pes;
+	FILE *fp = fopen(file, "w");
+
+	if (!fp) {
+		log_err("couldn't open '%s' to write table", file);
+		return 0;
+	}
+
+	for (i = 0; i < lv->le_count; i++) {
+		pes = lv->map + i;
+		dest = pes->pv->pe_start + (pe_size * pes->pe);
+		fprintf(fp, "%ull %ull linear %s %ull\n",
+			sector, pe_size, pes->pv->dev->name, dest);
+		sector += pe_size;
+	}
+	fclose(fp);
+
+	return 1;
+}

lib/activate/table-build.h

@@ -0,0 +1,13 @@
+/*
+ * Copyright (C) 2001 Sistina Software (UK) Limited.
+ *
+ * This file is released under the GPL.
+ */
+
+#ifndef TABLE_BUILD_H
+#define TABLE_BUILD_H
+
+int build_table(struct volume_group *vg, struct logical_volume *lv,
+		const char *file);
+
+#endif

lib/cache/lvmcache.c

@@ -1,581 +0,0 @@
-/*
- * Copyright (C) 2001-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 "lib.h"
-#include "lvmcache.h"
-#include "hash.h"
-#include "toolcontext.h"
-#include "dev-cache.h"
-#include "metadata.h"
-#include "filter.h"
-#include "memlock.h"
-#include "str_list.h"
-
-static struct hash_table *_pvid_hash = NULL;
-static struct hash_table *_vgid_hash = NULL;
-static struct hash_table *_vgname_hash = NULL;
-static struct hash_table *_lock_hash = NULL;
-static struct list _vginfos;
-static int _has_scanned = 0;
-static int _vgs_locked = 0;
-
-int lvmcache_init(void)
-{
-	list_init(&_vginfos);
-
-	if (!(_vgname_hash = hash_create(128)))
-		return 0;
-
-	if (!(_vgid_hash = hash_create(128)))
-		return 0;
-
-	if (!(_pvid_hash = hash_create(128)))
-		return 0;
-
-	if (!(_lock_hash = hash_create(128)))
-		return 0;
-
-	return 1;
-}
-
-void lvmcache_lock_vgname(const char *vgname, int read_only)
-{
-	if (!_lock_hash && !lvmcache_init()) {
-		log_error("Internal cache initialisation failed");
-		return;
-	}
-
-	if (!hash_insert(_lock_hash, vgname, (void *) 1))
-		log_error("Cache locking failure for %s", vgname);
-
-	_vgs_locked++;
-}
-
-static int _vgname_is_locked(const char *vgname) __attribute__ ((unused));
-static int _vgname_is_locked(const char *vgname)
-{
-	if (!_lock_hash)
-		return 0;
-
-	return hash_lookup(_lock_hash, vgname) ? 1 : 0;
-}
-
-void lvmcache_unlock_vgname(const char *vgname)
-{
-	/* FIXME: Clear all CACHE_LOCKED flags in this vg */
-	hash_remove(_lock_hash, vgname);
-
-	/* FIXME Do this per-VG */
-	if (!--_vgs_locked)
-		dev_close_all();
-}
-
-int vgs_locked(void)
-{
-	return _vgs_locked;
-}
-
-struct lvmcache_vginfo *vginfo_from_vgname(const char *vgname)
-{
-	struct lvmcache_vginfo *vginfo;
-
-	if (!_vgname_hash)
-		return NULL;
-
-	if (!(vginfo = hash_lookup(_vgname_hash, vgname)))
-		return NULL;
-
-	return vginfo;
-}
-
-const struct format_type *fmt_from_vgname(const char *vgname)
-{
-	struct lvmcache_vginfo *vginfo;
-
-	if (!(vginfo = vginfo_from_vgname(vgname)))
-		return NULL;
-
-	return vginfo->fmt;
-}
-
-struct lvmcache_vginfo *vginfo_from_vgid(const char *vgid)
-{
-	struct lvmcache_vginfo *vginfo;
-	char id[ID_LEN + 1];
-
-	if (!_vgid_hash || !vgid)
-		return NULL;
-
-	/* vgid not necessarily NULL-terminated */
-	strncpy(&id[0], vgid, ID_LEN);
-	id[ID_LEN] = '\0';
-
-	if (!(vginfo = hash_lookup(_vgid_hash, id)))
-		return NULL;
-
-	return vginfo;
-}
-
-struct lvmcache_info *info_from_pvid(const char *pvid)
-{
-	struct lvmcache_info *info;
-	char id[ID_LEN + 1];
-
-	if (!_pvid_hash || !pvid)
-		return NULL;
-
-	strncpy(&id[0], pvid, ID_LEN);
-	id[ID_LEN] = '\0';
-
-	if (!(info = hash_lookup(_pvid_hash, id)))
-		return NULL;
-
-	return info;
-}
-
-static void _rescan_entry(struct lvmcache_info *info)
-{
-	struct label *label;
-
-	if (info->status & CACHE_INVALID)
-		label_read(info->dev, &label);
-}
-
-static int _scan_invalid(void)
-{
-	hash_iter(_pvid_hash, (iterate_fn) _rescan_entry);
-
-	return 1;
-}
-
-int lvmcache_label_scan(struct cmd_context *cmd, int full_scan)
-{
-	struct label *label;
-	struct dev_iter *iter;
-	struct device *dev;
-	struct list *fmth;
-	struct format_type *fmt;
-
-	static int _scanning_in_progress = 0;
-	int r = 0;
-
-	/* Avoid recursion when a PVID can't be found! */
-	if (_scanning_in_progress)
-		return 0;
-
-	_scanning_in_progress = 1;
-
-	if (!_vgname_hash && !lvmcache_init()) {
-		log_error("Internal cache initialisation failed");
-		goto out;
-	}
-
-	if (_has_scanned && !full_scan) {
-		r = _scan_invalid();
-		goto out;
-	}
-
-	if (!(iter = dev_iter_create(cmd->filter))) {
-		log_error("dev_iter creation failed");
-		goto out;
-	}
-
-	while ((dev = dev_iter_get(iter)))
-		label_read(dev, &label);
-
-	dev_iter_destroy(iter);
-
-	_has_scanned = 1;
-
-	/* Perform any format-specific scanning e.g. text files */
-	list_iterate(fmth, &cmd->formats) {
-		fmt = list_item(fmth, struct format_type);
-		if (fmt->ops->scan && !fmt->ops->scan(fmt))
-			goto out;
-	}
-
-	r = 1;
-
-      out:
-	_scanning_in_progress = 0;
-
-	return r;
-}
-
-struct list *lvmcache_get_vgnames(struct cmd_context *cmd, int full_scan)
-{
-	struct list *vgnames;
-	struct lvmcache_vginfo *vgi;
-
-	lvmcache_label_scan(cmd, full_scan);
-
-	if (!(vgnames = str_list_create(cmd->mem))) {
-		log_error("vgnames list allocation failed");
-		return NULL;
-	}
-
-	list_iterate_items(vgi, &_vginfos) {
-		if (!str_list_add(cmd->mem, vgnames, 
-				  pool_strdup(cmd->mem, vgi->vgname))) {
-			log_error("strlist allocation failed");
-			return NULL;
-		}
-	}
-
-	return vgnames;
-}
-
-struct device *device_from_pvid(struct cmd_context *cmd, struct id *pvid)
-{
-	struct label *label;
-	struct lvmcache_info *info;
-
-	/* Already cached ? */
-	if ((info = info_from_pvid((char *) pvid))) {
-		if (label_read(info->dev, &label)) {
-			info = (struct lvmcache_info *) label->info;
-			if (id_equal(pvid, (struct id *) &info->dev->pvid))
-				return info->dev;
-		}
-	}
-
-	lvmcache_label_scan(cmd, 0);
-
-	/* Try again */
-	if ((info = info_from_pvid((char *) pvid))) {
-		if (label_read(info->dev, &label)) {
-			info = (struct lvmcache_info *) label->info;
-			if (id_equal(pvid, (struct id *) &info->dev->pvid))
-				return info->dev;
-		}
-	}
-
-	if (memlock())
-		return NULL;
-
-	lvmcache_label_scan(cmd, 1);
-
-	/* Try again */
-	if ((info = info_from_pvid((char *) pvid))) {
-		if (label_read(info->dev, &label)) {
-			info = (struct lvmcache_info *) label->info;
-			if (id_equal(pvid, (struct id *) &info->dev->pvid))
-				return info->dev;
-		}
-	}
-
-	return NULL;
-}
-
-static void _drop_vginfo(struct lvmcache_info *info)
-{
-	if (!list_empty(&info->list)) {
-		list_del(&info->list);
-		list_init(&info->list);
-	}
-
-	if (info->vginfo && list_empty(&info->vginfo->infos)) {
-		hash_remove(_vgname_hash, info->vginfo->vgname);
-		if (info->vginfo->vgname)
-			dbg_free(info->vginfo->vgname);
-		if (*info->vginfo->vgid)
-			hash_remove(_vgid_hash, info->vginfo->vgid);
-		list_del(&info->vginfo->list);
-		dbg_free(info->vginfo);
-	}
-
-	info->vginfo = NULL;
-}
-
-/* Unused
-void lvmcache_del(struct lvmcache_info *info)
-{
-	if (info->dev->pvid[0] && _pvid_hash)
-		hash_remove(_pvid_hash, info->dev->pvid);
-
-	_drop_vginfo(info);
-
-	info->label->labeller->ops->destroy_label(info->label->labeller,
-						info->label); 
-	dbg_free(info);
-
-	return;
-} */
-
-static int _lvmcache_update_pvid(struct lvmcache_info *info, const char *pvid)
-{
-	if (!strcmp(info->dev->pvid, pvid))
-		return 1;
-	if (*info->dev->pvid) {
-		hash_remove(_pvid_hash, info->dev->pvid);
-	}
-	strncpy(info->dev->pvid, pvid, sizeof(info->dev->pvid));
-	if (!hash_insert(_pvid_hash, pvid, info)) {
-		log_error("_lvmcache_update: pvid insertion failed: %s", pvid);
-		return 0;
-	}
-
-	return 1;
-}
-
-static int _lvmcache_update_vgid(struct lvmcache_info *info, const char *vgid)
-{
-	if (!vgid || !info->vginfo || !strncmp(info->vginfo->vgid, vgid,
-					       sizeof(info->vginfo->vgid)))
-		return 1;
-
-	if (info->vginfo && *info->vginfo->vgid)
-		hash_remove(_vgid_hash, info->vginfo->vgid);
-	if (!vgid)
-		return 1;
-
-	strncpy(info->vginfo->vgid, vgid, sizeof(info->vginfo->vgid));
-	info->vginfo->vgid[sizeof(info->vginfo->vgid) - 1] = '\0';
-	if (!hash_insert(_vgid_hash, info->vginfo->vgid, info->vginfo)) {
-		log_error("_lvmcache_update: vgid hash insertion failed: %s",
-			  info->vginfo->vgid);
-		return 0;
-	}
-
-	return 1;
-}
-
-int lvmcache_update_vgname(struct lvmcache_info *info, const char *vgname)
-{
-	struct lvmcache_vginfo *vginfo;
-
-	/* If vgname is NULL and we don't already have a vgname, 
-	 * assume ORPHAN - we want every entry to have a vginfo
-	 * attached for scanning reasons.
-	 */
-	if (!vgname && !info->vginfo)
-		vgname = ORPHAN;
-
-	if (!vgname || (info->vginfo && !strcmp(info->vginfo->vgname, vgname)))
-		return 1;
-
-	/* Remove existing vginfo entry */
-	_drop_vginfo(info);
-
-	/* Get existing vginfo or create new one */
-	if (!(vginfo = vginfo_from_vgname(vgname))) {
-		if (!(vginfo = dbg_malloc(sizeof(*vginfo)))) {
-			log_error("lvmcache_update_vgname: list alloc failed");
-			return 0;
-		}
-		memset(vginfo, 0, sizeof(*vginfo));
-		if (!(vginfo->vgname = dbg_strdup(vgname))) {
-			dbg_free(vginfo);
-			log_error("cache vgname alloc failed for %s", vgname);
-			return 0;
-		}
-		list_init(&vginfo->infos);
-		if (!hash_insert(_vgname_hash, vginfo->vgname, vginfo)) {
-			log_error("cache_update: vg hash insertion failed: %s",
-				  vginfo->vgname);
-			dbg_free(vginfo->vgname);
-			dbg_free(vginfo);
-			return 0;
-		}
-		/* Ensure orphans appear last on list_iterate */
-		if (!*vgname)
-			list_add(&_vginfos, &vginfo->list);
-		else
-			list_add_h(&_vginfos, &vginfo->list);
-	}
-
-	info->vginfo = vginfo;
-	list_add(&vginfo->infos, &info->list);
-
-	/* FIXME Check consistency of list! */
-	vginfo->fmt = info->fmt;
-
-	return 1;
-}
-
-int lvmcache_update_vg(struct volume_group *vg)
-{
-	struct list *pvh;
-	struct physical_volume *pv;
-	struct lvmcache_info *info;
-	char pvid_s[ID_LEN + 1];
-	int vgid_updated = 0;
-
-	pvid_s[sizeof(pvid_s) - 1] = '\0';
-
-	list_iterate(pvh, &vg->pvs) {
-		pv = list_item(pvh, struct pv_list)->pv;
-		strncpy(pvid_s, (char *) &pv->id, sizeof(pvid_s) - 1);
-		/* FIXME Could pv->dev->pvid ever be different? */
-		if ((info = info_from_pvid(pvid_s))) {
-			lvmcache_update_vgname(info, vg->name);
-			if (!vgid_updated) {
-				_lvmcache_update_vgid(info, (char *) &vg->id);
-				vgid_updated = 1;
-			}
-		}
-	}
-
-	return 1;
-}
-
-struct lvmcache_info *lvmcache_add(struct labeller *labeller, const char *pvid,
-				   struct device *dev,
-				   const char *vgname, const char *vgid)
-{
-	struct label *label;
-	struct lvmcache_info *existing, *info;
-	char pvid_s[ID_LEN + 1];
-
-	if (!_vgname_hash && !lvmcache_init()) {
-		log_error("Internal cache initialisation failed");
-		return NULL;
-	}
-
-	strncpy(pvid_s, pvid, sizeof(pvid_s));
-	pvid_s[sizeof(pvid_s) - 1] = '\0';
-
-	if (!(existing = info_from_pvid(pvid_s)) &&
-	    !(existing = info_from_pvid(dev->pvid))) {
-		if (!(label = label_create(labeller))) {
-			stack;
-			return NULL;
-		}
-		if (!(info = dbg_malloc(sizeof(*info)))) {
-			log_error("lvmcache_info allocation failed");
-			label_destroy(label);
-			return NULL;
-		}
-		memset(info, 0, sizeof(*info));
-
-		label->info = info;
-		info->label = label;
-		list_init(&info->list);
-		info->dev = dev;
-	} else {
-		if (existing->dev != dev) {
-			/* Is the existing entry a duplicate pvid e.g. md ? */
-			if (MAJOR(existing->dev->dev) == md_major() &&
-			    MAJOR(dev->dev) != md_major()) {
-				log_very_verbose("Ignoring duplicate PV %s on "
-						 "%s - using md %s",
-						 pvid, dev_name(dev),
-						 dev_name(existing->dev));
-				return NULL;
-			} else if (MAJOR(existing->dev->dev) != md_major() &&
-				   MAJOR(dev->dev) == md_major())
-				log_very_verbose("Duplicate PV %s on %s - "
-						 "using md %s", pvid,
-						 dev_name(existing->dev),
-						 dev_name(dev));
-			else
-				log_error("Found duplicate PV %s: using %s not "
-					  "%s", pvid, dev_name(dev),
-					  dev_name(existing->dev));
-		}
-		info = existing;
-		/* Has labeller changed? */
-		if (info->label->labeller != labeller) {
-			label_destroy(info->label);
-			if (!(info->label = label_create(labeller))) {
-				/* FIXME leaves info without label! */
-				stack;
-				return NULL;
-			}
-			info->label->info = info;
-		}
-		label = info->label;
-	}
-
-	info->fmt = (const struct format_type *) labeller->private;
-	info->status |= CACHE_INVALID;
-
-	if (!_lvmcache_update_pvid(info, pvid_s)) {
-		if (!existing) {
-			dbg_free(info);
-			label_destroy(label);
-		}
-		return NULL;
-	}
-
-	if (!lvmcache_update_vgname(info, vgname)) {
-		if (!existing) {
-			hash_remove(_pvid_hash, pvid_s);
-			strcpy(info->dev->pvid, "");
-			dbg_free(info);
-			label_destroy(label);
-		}
-		return NULL;
-	}
-
-	if (!_lvmcache_update_vgid(info, vgid))
-		/* Non-critical */
-		stack;
-
-	return info;
-}
-
-static void _lvmcache_destroy_entry(struct lvmcache_info *info)
-{
-	if (!list_empty(&info->list))
-		list_del(&info->list);
-	strcpy(info->dev->pvid, "");
-	label_destroy(info->label);
-	dbg_free(info);
-}
-
-static void _lvmcache_destroy_vgnamelist(struct lvmcache_vginfo *vginfo)
-{
-	if (vginfo->vgname)
-		dbg_free(vginfo->vgname);
-	dbg_free(vginfo);
-}
-
-static void _lvmcache_destroy_lockname(int present)
-{
-	/* Nothing to do */
-}
-
-void lvmcache_destroy(void)
-{
-	_has_scanned = 0;
-
-	if (_vgid_hash) {
-		hash_destroy(_vgid_hash);
-		_vgid_hash = NULL;
-	}
-
-	if (_pvid_hash) {
-		hash_iter(_pvid_hash, (iterate_fn) _lvmcache_destroy_entry);
-		hash_destroy(_pvid_hash);
-		_pvid_hash = NULL;
-	}
-
-	if (_vgname_hash) {
-		hash_iter(_vgname_hash,
-			  (iterate_fn) _lvmcache_destroy_vgnamelist);
-		hash_destroy(_vgname_hash);
-		_vgname_hash = NULL;
-	}
-
-	if (_lock_hash) {
-		hash_iter(_lock_hash, (iterate_fn) _lvmcache_destroy_lockname);
-		hash_destroy(_lock_hash);
-		_lock_hash = NULL;
-	}
-
-	list_init(&_vginfos);
-}

lib/cache/lvmcache.h

@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2001-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_CACHE_H
-#define _LVM_CACHE_H
-
-#include "dev-cache.h"
-#include "uuid.h"
-#include "label.h"
-#include "metadata.h"
-
-#define ORPHAN ""
-
-#define CACHE_INVALID	0x00000001
-#define CACHE_LOCKED	0x00000002
-
-/* LVM specific per-volume info */
-/* Eventual replacement for struct physical_volume perhaps? */
-
-struct lvmcache_vginfo {
-	struct list list;	/* Join these vginfos together */
-	struct list infos;	/* List head for lvmcache_infos */
-	char *vgname;		/* "" == orphan */
-	char vgid[ID_LEN + 1];
-	const struct format_type *fmt;
-};
-
-struct lvmcache_info {
-	struct list list;	/* Join VG members together */
-	struct list mdas;	/* list head for metadata areas */
-	struct list das;	/* list head for data areas */
-	struct lvmcache_vginfo *vginfo;	/* NULL == unknown */
-	struct label *label;
-	const struct format_type *fmt;
-	struct device *dev;
-	uint64_t device_size;	/* Bytes */
-	uint32_t status;
-};
-
-int lvmcache_init(void);
-void lvmcache_destroy(void);
-
-/* Set full_scan to 1 to reread every filtered device label */
-int lvmcache_label_scan(struct cmd_context *cmd, int full_scan);
-
-/* Add/delete a device */
-struct lvmcache_info *lvmcache_add(struct labeller *labeller, const char *pvid,
-				   struct device *dev,
-				   const char *vgname, const char *vgid);
-void lvmcache_del(struct lvmcache_info *info);
-
-/* Update things */
-int lvmcache_update_vgname(struct lvmcache_info *info, const char *vgname);
-int lvmcache_update_vg(struct volume_group *vg);
-
-void lvmcache_lock_vgname(const char *vgname, int read_only);
-void lvmcache_unlock_vgname(const char *vgname);
-
-/* Queries */
-const struct format_type *fmt_from_vgname(const char *vgname);
-struct lvmcache_vginfo *vginfo_from_vgname(const char *vgname);
-struct lvmcache_vginfo *vginfo_from_vgid(const char *vgid);
-struct lvmcache_info *info_from_pvid(const char *pvid);
-struct device *device_from_pvid(struct cmd_context *cmd, struct id *pvid);
-int vgs_locked(void);
-
-/* Returns list of struct str_lists containing pool-allocated copy of vgnames */
-/* Set full_scan to 1 to reread every filtered device label */
-struct list *lvmcache_get_vgnames(struct cmd_context *cmd, int full_scan);
-
-#endif

lib/cmgr/clvm.h

@@ -0,0 +1,46 @@
+/* Definitions for CLVMD server and clients */
+
+
+/* The protocol spoken over the cluster and across the local
+   socket
+*/
+
+struct clvm_header
+{
+    unsigned char  cmd;        /* See below */
+    unsigned char  flags;      /* See below */
+    unsigned short pad;        /* To keep alignment sane */
+    unsigned int   clientid;   /* Only used in Daemon->Daemon comms */
+    int            status;     /* For replies, whether the request suceeded or not */
+    unsigned int   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 is in system LV under my node name */
+
+/* Name of the local socket to communicate between libclvm and clvmd */
+#define CLVMD_SOCKNAME "/var/run/clvmd"
+
+/* Command numbers */
+#define CLVMD_CMD_TEST               4
+
+/* Lock/Unlock commands */
+#define CLVMD_CMD_LOCK              30
+#define CLVMD_CMD_UNLOCK            31
+
+#define CLVMD_CMD_LOCK_SUSPEND      32
+#define CLVMD_CMD_UNLOCK_RESUME     33
+
+/* Info Commands */
+#define CLVMD_CMD_LVDISPLAY         40
+#define CLVMD_CMD_LVCHECK           41
+#define CLVMD_CMD_VGDISPLAY         42
+#define CLVMD_CMD_VGCHECK           43

lib/cmgr/cmgr.c

@@ -0,0 +1,874 @@
+/*
+ * Copyright (C) 2001 Sistina Software (UK) Limited.
+ *
+ * This file is released under the LGPL.
+ */
+
+/* Locking functions for LVM
+ * The main purpose of this part of the library is to serialise LVM
+ * management operations (across a cluster if necessary)
+ */
+
+
+#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 <search.h>
+#include <errno.h>
+
+#include "metadata.h"
+#include "activate.h"
+#include "log.h"
+#include "clvm.h"
+#include "cmgr.h"
+
+
+/* This gets stuck at the start of memory we allocate so we
+   can sanity-check it at deallocation time */
+#define LVM_SIGNATURE 0x434C564D
+#define MAX_CLUSTER_MEMBER_NAME_LEN 255
+#define LVM_GLOBAL_LOCK "LVM_GLOBAL"
+#define LOCKFILE_DIR "/var/lock/lvm"
+
+/* NOTE: the LVMD uses the socket FD as the client ID, this means
+   that any client that calls fork() will inherit the context of
+   it's parent. */
+static int clvmd_sock = -1;
+
+/* Open connection to the Cluster Manager daemon */
+static int open_local_sock(void)
+{
+    int local_socket;
+    struct sockaddr_un sockaddr;
+
+    /* Open local socket */
+    local_socket = socket(PF_UNIX, SOCK_STREAM, 0);
+    if (local_socket < 0)
+    {
+	perror("Can't create local socket");
+	return -1;
+    }
+
+    fcntl(local_socket, F_SETFD, !FD_CLOEXEC);
+
+    strcpy(sockaddr.sun_path, CLVMD_SOCKNAME);
+    sockaddr.sun_family = AF_UNIX;
+    if (connect(local_socket, (struct sockaddr *)&sockaddr, sizeof(sockaddr)))
+    {
+	int saved_errno = errno;
+
+	close(local_socket);
+
+	errno = saved_errno;
+        return -1;
+    }
+    return local_socket;
+}
+
+/* Send a request and return the status */
+static int send_request(char *inbuf, int inlen, char **retbuf)
+{
+    char outbuf[PIPE_BUF];
+    struct clvm_header *outheader = (struct clvm_header *)outbuf;
+    int len;
+    int off;
+    fd_set fds;
+
+    FD_ZERO(&fds);
+    FD_SET(clvmd_sock, &fds);
+
+    /* Send it to CLVMD */
+    if (write(clvmd_sock, inbuf, inlen) != inlen)
+    {
+	perror("Error writing to CLVMD");
+	return -1;
+    }
+
+    /* Get the response */
+    if ( (len = read(clvmd_sock, outbuf, sizeof(struct clvm_header))) < 0)
+    {
+	perror("Error reading CLVMD");
+	return -1;
+    }
+    if (len == 0)
+    {
+	fprintf(stderr, "EOF reading CLVMD");
+	errno = ENOTCONN;
+	return -1;
+    }
+
+    /* Allocate buffer */
+    *retbuf = malloc(len + outheader->arglen);
+    if (!*retbuf)
+    {
+	errno = ENOMEM;
+	return -1;
+    }
+
+    /* Copy the header */
+    memcpy(*retbuf, outbuf, len);
+    outheader = (struct clvm_header *)*retbuf;
+
+    /* Read the returned values */
+    off = 1; /* we've already read the first byte */
+
+    while (off < outheader->arglen && len > 0)
+    {
+	len = read(clvmd_sock, outheader->args+off, PIPE_BUF);
+	if (len > 0)
+	    off += len;
+    }
+
+    /* Was it an error ? */
+    if (outheader->status < 0)
+    {
+	errno = -outheader->status;
+	return -2;
+    }
+    return 0;
+}
+
+/* Build the structure header and parse-out wildcard node names */
+static void build_header(struct clvm_header *head, int cmd, char *node, void *data, int len)
+{
+    head->cmd      = cmd;
+    head->status   = 0;
+    head->flags    = 0;
+    head->clientid = 0;
+    head->arglen   = len;
+    if (node)
+    {
+	/* Allow a couple of special node names:
+	 "*" for all nodes,
+	 "." for the local node only
+	*/
+	if (strcmp(node, "*") == 0)
+	{
+	    head->node[0] = '\0';
+	}
+	else if (strcmp(node, ".") == 0)
+	{
+	    head->node[0] = '\0';
+	    head->flags = CLVMD_FLAG_LOCAL;
+	}
+	else
+	{
+	    strcpy(head->node, node);
+	}
+    }
+    else
+    {
+	head->node[0] = '\0';
+    }
+}
+
+/* Send a message to a(or all) node(s) in the cluster */
+int cluster_write(char cmd, char *node, void *data, int len)
+{
+    char  outbuf[sizeof(struct clvm_header)+len+strlen(node)+1];
+    char *retbuf = NULL;
+    int   status;
+    struct clvm_header *head = (struct clvm_header *)outbuf;
+
+    if (clvmd_sock == -1)
+	clvmd_sock = open_local_sock();
+    if (clvmd_sock == -1)
+	return -1;
+
+    build_header(head, cmd, node, data, len);
+    memcpy(head->node+strlen(head->node)+1, data, len);
+
+    status = send_request(outbuf, sizeof(struct clvm_header)+strlen(head->node)+len, &retbuf);
+    if (retbuf) free(retbuf);
+
+    return status;
+}
+
+
+
+/* API: Send a message to a(or all) node(s) in the cluster
+   and wait for replies */
+int cluster_request(char cmd, char *node, void *data, int len,
+		    lvm_response_t **response, int *num)
+{
+    char  outbuf[sizeof(struct clvm_header)+len+strlen(node)+1];
+    int  *outptr;
+    char *inptr;
+    char *retbuf = NULL;
+    int   status;
+    int   i;
+    int   num_responses=0;
+    struct clvm_header *head = (struct clvm_header *)outbuf;
+    lvm_response_t *rarray;
+
+    *num = 0;
+
+    if (clvmd_sock == -1)
+	clvmd_sock = open_local_sock();
+    if (clvmd_sock == -1)
+	return -1;
+
+    build_header(head, cmd, node, data, len);
+    memcpy(head->node+strlen(head->node)+1, data, len);
+
+    status = send_request(outbuf, sizeof(struct clvm_header)+strlen(head->node)+len, &retbuf);
+    if (status == 0 || status == -2)
+    {
+	/* Count the number of responses we got */
+	head = (struct clvm_header *)retbuf;
+	inptr = head->args;
+	while (inptr[0])
+	{
+	    num_responses++;
+	    inptr += strlen(inptr)+1;
+	    inptr += sizeof(int);
+	    inptr += strlen(inptr)+1;
+	}
+
+	/* Allocate response array. With an extra pair of INTs on the front to sanity
+	   check the pointer when we are given it back to free */
+	outptr = malloc(sizeof(lvm_response_t) * num_responses + sizeof(int)*2);
+	if (!outptr)
+	{
+	    if (retbuf) free(retbuf);
+	    errno = ENOMEM;
+	    return -1;
+	}
+
+	*response = (lvm_response_t *)(outptr+2);
+	outptr[0] = LVM_SIGNATURE;
+	outptr[1] = num_responses;
+	rarray = *response;
+
+	/* Unpack the response into an lvm_response_t array */
+	inptr = head->args;
+	i = 0;
+	while (inptr[0])
+	{
+	    strcpy(rarray[i].node, inptr);
+	    inptr += strlen(inptr)+1;
+
+	    rarray[i].status = *(int *)inptr;
+	    inptr += sizeof(int);
+
+	    rarray[i].response = malloc(strlen(inptr)+1);
+	    if (rarray[i].response == NULL)
+	    {
+		/* Free up everything else and return error */
+		int j;
+		for (j=0; j<i; j++)
+		    free(rarray[i].response);
+		free(outptr);
+		errno = ENOMEM;
+		return -1;
+	    }
+
+	    strcpy(rarray[i].response, inptr);
+	    rarray[i].len = strlen(inptr);
+	    inptr += strlen(inptr)+1;
+	    i++;
+	}
+	*num = num_responses;
+	*response = rarray;
+    }
+
+    if (retbuf) free(retbuf);
+    return status;
+}
+
+/* API: Free reply array */
+int cluster_free_request(lvm_response_t *response)
+{
+    int *ptr = (int *)response-2;
+    int i;
+    int num;
+
+    /* Check it's ours to free */
+    if (response == NULL || *ptr != LVM_SIGNATURE)
+    {
+	errno = EINVAL;
+	return -1;
+    }
+
+    num = ptr[1];
+    for (i = 0; i<num; i++)
+    {
+	free(response[i].response);
+    }
+    free(ptr);
+
+    return 0;
+}
+
+
+
+static pid_t locked_by(char *lockfile_name)
+{
+    /* Check lock is not stale - the file should contain
+       the owners PID */
+    FILE *f = fopen(lockfile_name, "r");
+    pid_t pid = 0;
+
+    if (f)
+    {
+	char proc_pid[PATH_MAX];
+	struct stat st;
+
+	/* Normal practice to to kill -0 the process at this point
+	   but we may not have the privilege */
+	fscanf(f, "%d\n", &pid);
+	fclose(f);
+
+	snprintf(proc_pid, sizeof(proc_pid), "/proc/%d", pid);
+	if (stat(proc_pid, &st) == 0)
+	{
+	    /* Process exists - lock is valid. */
+	    return pid;
+	}
+	/* Remove stale lock file */
+	unlink(lockfile_name);
+    }
+
+    /* Not locked */
+    return -1;
+}
+
+
+/* LOCK resource using a file */
+static int lock_resource(char *resource, int mode, int flags, int *lockid)
+{
+    struct stat;
+    int fd;
+    char lockfile_name[PATH_MAX];
+    mode_t old_umask;
+    FILE *pidfile;
+    int ret = -1;
+    int ret_errno;
+
+    if (mode != LKM_EXMODE)
+    {
+	ret_errno = EINVAL;
+	goto lock_finish;
+    }
+
+    old_umask = umask(000);
+
+    ret_errno = -EPERM;
+    if (mkdir(LOCKFILE_DIR, 0777) != 0)
+	if (errno != EEXIST)
+	    goto lock_finish;
+
+    /* Make the lockfile name */
+    snprintf(lockfile_name, sizeof(lockfile_name), LOCKFILE_DIR "/%s", resource);
+
+    /* Keep trying to lock untill we succeed
+       unless LKM_NONBLOCK was requested */
+    do
+    {
+	fd = open(lockfile_name, O_CREAT|O_EXCL|O_WRONLY, 0666);
+	if (fd == -1)
+	{
+	    pid_t owner_pid;
+
+	    /* Is the permission on the directory correct ? */
+	    if (errno == EPERM)
+		goto lock_finish;
+
+	    owner_pid = locked_by(lockfile_name);
+	    /* If it's locked and the caller doesn't want to block then return */
+	    if (owner_pid > 0 && (flags & O_NONBLOCK))
+	    {
+		ret_errno = EAGAIN;
+		goto lock_finish;
+	    }
+
+	    /* If it's locked, then wait and try again in a second,
+	       Ugh, need directrory notification */
+	    if (owner_pid > 0)
+	    {
+		sleep(1);
+	    }
+	}
+    }
+    while (fd < 0);
+
+    /* OK - lock it */
+    pidfile = fdopen(fd, "w");
+    if (pidfile)
+    {
+	fprintf(pidfile, "%d\n", getpid());
+	fclose(pidfile);
+	ret = 0;
+    }
+
+lock_finish:
+    umask(old_umask);
+    errno = ret_errno;
+    return ret;
+}
+
+
+static int unlock_resource(char *resource, int lockid)
+{
+    char lockfile_name[PATH_MAX];
+    pid_t owner_pid;
+
+    snprintf(lockfile_name, sizeof(lockfile_name), LOCKFILE_DIR "/%s", resource);
+
+    owner_pid = locked_by(lockfile_name);
+
+    /* Is it locked by us ? */
+    if (owner_pid != getpid())
+    {
+	errno = EINVAL;
+	return -1;
+    }
+    unlink(lockfile_name);
+    return 0;
+}
+
+
+/* These are a "higher-level" API providing black-box lock/unlock
+   functions for cluster LVM...maybe */
+
+/* Set by lock(), used by unlock() */
+static int num_responses;
+static lvm_response_t *response;
+
+int lock_for_cluster(char scope, char *name, int namelen, int suspend)
+{
+    int  status;
+    int  i;
+    char *args;
+    int  len;
+    int  cmd;
+
+    /* Validate scope */
+    if (scope != 'V' && scope != 'L' && scope != 'G')
+    {
+	errno = EINVAL;
+	return -1;
+    }
+
+    /* Allow for NULL in name field */
+    if (name && namelen)
+    {
+	len = namelen + 2;
+	args = alloca(namelen);
+	memcpy(args+1, name, namelen);
+    }
+    else
+    {
+	len = 2;
+	args = alloca(len);
+	args[1] = '\0';
+    }
+    args[0] = scope;
+
+    cmd = (suspend)?CLVMD_CMD_LOCK_SUSPEND:CLVMD_CMD_LOCK;
+
+    status = cluster_request(cmd,
+			     "", args, len,
+			     &response, &num_responses);
+
+    /* If any nodes were down then display them and return an error */
+    for (i=0; i<num_responses; i++)
+    {
+	if (response[i].status == -EHOSTDOWN)
+	{
+	    log_verbose("clvmd not running on node %s\n", response[i].node);
+	    status = -1;
+	}
+    }
+
+    /* If there was an error then free the memory now as the caller won't
+       want to do the unlock */
+    if (status)
+    {
+	int saved_errno = errno;
+	cluster_free_request(response);
+	num_responses = 0;
+	errno = saved_errno;
+    }
+    return status;
+}
+
+int unlock_for_cluster(char scope, char *name, int namelen, int suspend)
+{
+    int status;
+    int i;
+    int len;
+    int failed;
+    int cmd;
+    int num_unlock_responses;
+    char *args;
+    lvm_response_t *unlock_response;
+
+    /* We failed - this should not have been called */
+    if (num_responses == 0)
+	return 0;
+
+    /* Validate scope */
+    if (scope != 'V' && scope != 'L' && scope != 'G' &&
+	scope != 'v' && scope != 'l' && scope != 'g')
+    {
+	errno = EINVAL;
+	return -1;
+    }
+
+    /* Allow for NULL in name field */
+    if (name && namelen)
+    {
+	len = namelen + 2;
+	args = alloca(namelen);
+	memcpy(args+1, name, namelen);
+    }
+    else
+    {
+	len = 2;
+	args = alloca(len);
+	args[1] = '\0';
+    }
+    args[0] = scope;
+
+    cmd = (suspend)?CLVMD_CMD_UNLOCK_RESUME:CLVMD_CMD_UNLOCK;
+
+    /* See if it failed anywhere */
+    failed = 0;
+    for (i=0; i<num_responses; i++)
+    {
+	if (response[i].status != 0)
+	    failed++;
+    }
+
+    /* If it failed on any nodes then we only unlock on
+       the nodes that succeeded */
+    if (failed)
+    {
+	for (i=0; i<num_responses; i++)
+	{
+	    /* Unlock the ones that succeeded */
+	    if (response[i].status == 0)
+	    {
+		status = cluster_request(cmd,
+					 response[i].node,
+					 args, len,
+					 &unlock_response, &num_unlock_responses);
+		if (status)
+		{
+		    log_verbose("cluster command to node %s failed: %s\n",
+				    response[i].node, strerror(errno));
+		}
+		else if (unlock_response[0].status != 0)
+		{
+		    log_verbose("unlock on node %s failed: %s\n",
+				response[i].node, strerror(unlock_response[0].status));
+		}
+		cluster_free_request(unlock_response);
+	    }
+	    else
+	    {
+		log_verbose("command on node %s failed: '%s' - will be left locked\n",
+			    response[i].node, strerror(response[i].status));
+	    }
+	}
+    }
+    else
+    {
+	/* All OK, we can do a full cluster unlock */
+	status = cluster_request(cmd,
+				 "",
+				 args, len,
+				 &unlock_response, &num_unlock_responses);
+	if (status)
+	{
+	    log_verbose("cluster command failed: %s\n",
+			strerror(errno));
+	}
+	else
+	{
+	    for (i=0; i<num_unlock_responses; i++)
+	    {
+		if (unlock_response[i].status != 0)
+		{
+		    log_verbose("unlock on node %s failed: %s\n",
+				response[i].node, strerror(unlock_response[0].status));
+		}
+	    }
+	}
+	cluster_free_request(unlock_response);
+    }
+    cluster_free_request(response);
+
+    return 0;
+}
+
+
+/* Keep track of the current request state */
+static int clustered = 0;
+static int suspended = 0;
+static int lockid;
+
+/* Lock the whole system */
+int lock_lvm(int suspend)
+{
+    int status;
+
+    suspended = suspend;
+    status = lock_for_cluster('G', NULL, 0, suspend);
+    if (status == -1)
+    {
+	/* ENOENT means clvmd is not running - assume we are not clustered */
+	/* TODO: May need some way of forcing this to fail in the future */
+	if (errno == ENOENT)
+	{
+	    clustered = 0;
+	    status = lock_resource(LVM_GLOBAL_LOCK, LKM_EXMODE, 0, &lockid);
+	    if (!status)
+		return status;
+
+	    /* TODO: suspend? */
+	    return 0;
+	}
+	clustered = 1;
+	return -1;
+    }
+    clustered = 1;
+    return status;
+}
+
+
+int unlock_lvm(int cmd_status)
+{
+    if (!clustered)
+    {
+	/* TODO: resume? */
+	return unlock_resource(LVM_GLOBAL_LOCK, lockid);
+    }
+    else
+    {
+	char cmd = (cmd_status==0)?'G':'g';
+	return unlock_for_cluster(cmd, NULL, 0, suspended);
+    }
+}
+
+
+/* Lock a whole Volume group and all its LVs */
+int lock_vg(struct volume_group *vg, int suspend)
+{
+    int status;
+
+    suspended = suspend;
+    status = lock_for_cluster('V', vg->name, strlen(vg->name)+1, suspend);
+    if (status == -1)
+    {
+	/* ENOENT means clvmd is not running - assume we are not clustered */
+	/* TODO: May need some way of forcing this to fail in the future */
+	if (errno == ENOENT)
+	{
+	    clustered = 0;
+
+	    /* Get LVM lock */
+	    status = lock_resource(LVM_GLOBAL_LOCK, LKM_EXMODE, 0, &lockid);
+	    if (!status)
+		return status;
+
+	    if (suspend) suspend_lvs_in_vg(vg, 1);
+	    return 0;
+	}
+	clustered = 1;
+	return -1;
+    }
+    clustered = 1;
+    return status;
+}
+
+
+int unlock_vg(struct volume_group *vg, int cmd_status)
+{
+    if (!clustered)
+    {
+	activate_lvs_in_vg(vg);
+	return unlock_resource(LVM_GLOBAL_LOCK, lockid);
+    }
+    else
+    {
+	char cmd = (cmd_status==0)?'V':'v';
+	return unlock_for_cluster(cmd, vg->name, strlen(vg->name)+1, suspended);
+    }
+}
+
+/* Just lock a Logical volume */
+int lock_lv(struct logical_volume *lv, int suspend)
+{
+    int status;
+    char full_lv_name[strlen(lv->name)+strlen(lv->vg->name)+2];
+
+    sprintf(full_lv_name, "%s/%s", lv->vg->name, lv->name);
+
+    suspended = suspend;
+    status = lock_for_cluster('L', full_lv_name,  strlen(full_lv_name)+1, suspend);
+    if (status == -1)
+    {
+	/* ENOENT means clvmd is not running - assume we are not clustered */
+	/* TODO: May need some way of forcing this to fail in the future */
+	if (errno == ENOENT)
+	{
+	    clustered = 0;
+
+	    /* Get LVM lock */
+	    status = lock_resource(LVM_GLOBAL_LOCK, LKM_EXMODE, 0, &lockid);
+	    if (!status)
+		return status;
+
+	    if (suspend) lv_suspend(lv, 1);
+	    return 0;
+	}
+	clustered = 1;
+	return -1;
+    }
+    clustered = 1;
+    return status;
+}
+
+
+int unlock_lv(struct logical_volume *lv, int cmd_status)
+{
+    char full_lv_name[strlen(lv->name)+strlen(lv->vg->name)+2];
+
+    sprintf(full_lv_name, "%s/%s", lv->vg->name, lv->name);
+
+    if (!clustered)
+    {
+	lv_reactivate(lv);
+	return unlock_resource(LVM_GLOBAL_LOCK, lockid);
+    }
+    else
+    {
+	char cmd = (cmd_status==0)?'L':'l';
+	return unlock_for_cluster(cmd, full_lv_name, strlen(full_lv_name)+1, suspended);
+    }
+}
+
+/*
+  Maybe should replace lv_open_count() (Which we use!)
+ */
+int get_lv_open_count(struct logical_volume *lv, int *open_count)
+{
+    int status;
+    int num_lv_responses;
+    lvm_response_t *lv_response;
+    int count = 0;
+    int i;
+
+
+    /* Do cluster check */
+    status = cluster_request(CLVMD_CMD_LVCHECK, "",
+			     lv->name, strlen(lv->name)+1,
+			     &lv_response, &num_lv_responses);
+    /* Are we sngle-node only ?*/
+    if (status == -1 && errno == ENOENT)
+    {
+	*open_count = lv_open_count(lv);
+	return 0;
+    }
+
+    if (status)
+    {
+	int saved_errno = errno;
+	cluster_free_request(lv_response);
+	errno = saved_errno;
+	return status;
+    }
+
+    for (i=0; i<num_lv_responses; i++)
+    {
+	if (lv_response[i].status != 0)
+	{
+	    log_verbose("lv_open_count on node %s failed: %s\n",
+			lv_response[i].node, strerror(lv_response[i].status));
+	}
+	else
+	{
+	    if (lv_response[i].response[0] != '\0')
+	    {
+		count++;
+		log_verbose("Logical volume %s is open on node %s\n",
+			    lv->name, lv_response[i].node);
+	    }
+	}
+    }
+    cluster_free_request(lv_response);
+
+    *open_count = count;
+
+    return 0;
+}
+
+/*
+  Get the number of nodes the VG is active on.
+*/
+int get_vg_active_count(struct volume_group *vg, int *active_count)
+{
+    int status;
+    int num_vg_responses;
+    lvm_response_t *vg_response;
+    int count = 0;
+    int i;
+
+    /* Do cluster check */
+    status = cluster_request(CLVMD_CMD_VGCHECK, "",
+			     vg->name, strlen(vg->name)+1,
+			     &vg_response, &num_vg_responses);
+
+    /* Are we sngle-node only ?*/
+    if (status == -1 && errno == ENOENT)
+    {
+	*active_count = 1; //vg_active(vg);
+	return 0;
+    }
+
+    if (status)
+    {
+	int saved_errno = errno;
+	cluster_free_request(vg_response);
+	errno = saved_errno;
+	return status;
+    }
+
+    for (i=0; i<num_vg_responses; i++)
+    {
+	if (vg_response[i].status != 0)
+	{
+	    log_verbose("vg_active_count on node %s failed: %s\n",
+			vg_response[i].node, strerror(vg_response[i].status));
+	}
+	else
+	{
+	    if (vg_response[i].response[0] != '\0')
+	    {
+		count++;
+		log_verbose("Volume group %s is active on node %s\n",
+			    vg->name, vg_response[i].node);
+	    }
+	}
+    }
+    cluster_free_request(vg_response);
+
+    *active_count = count;
+
+    return 0;
+}

lib/cmgr/cmgr.h

@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2001 Sistina Software (UK) Limited.
+ *
+ * This file is released under the GPL.
+ *
+ * This is the interface to the locking and cluster manager
+ */
+
+typedef struct lvm_response
+{
+    char  node[255];
+    char *response;
+    int   status;
+    int   len;
+
+} lvm_response_t;
+
+/* The "direct to cluster manager" API */
+extern int cluster_request(char cmd, char *node, void *data, int len,
+			       lvm_response_t **response, int *num);
+extern int cluster_write(char cmd, char *node, void *data, int len);
+extern int cluster_free_request(lvm_response_t *response);
+
+
+/* The "high-level" API */
+extern int lock_for_cluster(char scope, char *name, int namelen, int suspend);
+extern int unlock_for_cluster(char scope, char *name, int namelen, int suspend);
+
+/* The "even higher-level" API that also copes with
+   non-clustered environment. */
+extern int lock_lvm(int suspend);
+extern int unlock_lvm(int cmd_status);
+
+extern int lock_lv(struct logical_volume *lv, int suspend);
+extern int unlock_lv(struct logical_volume *lv, int cmd_status);
+
+extern int lock_vg(struct volume_group *vg, int suspend);
+extern int unlock_vg(struct volume_group *vg, int cmd_status);
+
+/* The system must be locked by one of the above calls before
+   using these */
+extern int get_lv_open_count(struct logical_volume *lv, int *open_count);
+extern int get_vg_active_count(struct volume_group *vg, int *active_count);
+
+/* Lock modes: these are taken from the IBM DLM,
+   but we only support EX! */
+#define   LKM_NLMODE      0               /* null lock */
+#define   LKM_CRMODE      1               /* concurrent read */
+#define   LKM_CWMODE      2               /* concurrent write */
+#define   LKM_PRMODE      3               /* protected read */
+#define   LKM_PWMODE      4               /* protected write */
+#define   LKM_EXMODE      5               /* exclusive */

lib/commands/errors.h

@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2001-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_ERRORS_H
-#define _LVM_ERRORS_H
-
-#define ECMD_PROCESSED		1
-#define ENO_SUCH_CMD		2
-#define EINVALID_CMD_LINE	3
-#define ECMD_FAILED		5
-
-#endif

lib/commands/toolcontext.c

@@ -1,686 +0,0 @@
-/*
- * Copyright (C) 2001-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 "lib.h"
-#include "toolcontext.h"
-#include "pool.h"
-#include "metadata.h"
-#include "defaults.h"
-#include "lvm-string.h"
-#include "activate.h"
-#include "filter.h"
-#include "filter-composite.h"
-#include "filter-persistent.h"
-#include "filter-regex.h"
-#include "filter-sysfs.h"
-#include "label.h"
-#include "lvm-file.h"
-#include "format-text.h"
-#include "display.h"
-#include "memlock.h"
-#include "str_list.h"
-
-#ifdef HAVE_LIBDL
-#include "sharedlib.h"
-#endif
-
-#ifdef LVM1_INTERNAL
-#include "format1.h"
-#endif
-
-#include <locale.h>
-#include <sys/stat.h>
-#include <sys/utsname.h>
-#include <syslog.h>
-#include <time.h>
-
-#ifdef linux
-#  include <malloc.h>
-#endif
-
-static FILE *_log;
-
-static int _get_env_vars(struct cmd_context *cmd)
-{
-	const char *e;
-
-	/* Set to "" to avoid using any system directory */
-	if ((e = getenv("LVM_SYSTEM_DIR"))) {
-		if (lvm_snprintf(cmd->sys_dir, sizeof(cmd->sys_dir),
-				 "%s", e) < 0) {
-			log_error("LVM_SYSTEM_DIR environment variable "
-				  "is too long.");
-			return 0;
-		}
-	}
-
-	return 1;
-}
-
-static void _init_logging(struct cmd_context *cmd)
-{
-	int append = 1;
-	time_t t;
-
-	const char *log_file;
-
-	/* Syslog */
-	cmd->default_settings.syslog =
-	    find_config_int(cmd->cft->root, "log/syslog", DEFAULT_SYSLOG);
-	if (cmd->default_settings.syslog != 1)
-		fin_syslog();
-
-	if (cmd->default_settings.syslog > 1)
-		init_syslog(cmd->default_settings.syslog);
-
-	/* Debug level for log file output */
-	cmd->default_settings.debug =
-	    find_config_int(cmd->cft->root, "log/level", DEFAULT_LOGLEVEL);
-	init_debug(cmd->default_settings.debug);
-
-	/* Verbose level for tty output */
-	cmd->default_settings.verbose =
-	    find_config_int(cmd->cft->root, "log/verbose", DEFAULT_VERBOSE);
-	init_verbose(cmd->default_settings.verbose + VERBOSE_BASE_LEVEL);
-
-	/* Log message formatting */
-	init_indent(find_config_int(cmd->cft->root, "log/indent",
-				    DEFAULT_INDENT));
-
-	cmd->default_settings.msg_prefix = find_config_str(cmd->cft->root,
-							   "log/prefix",
-							   DEFAULT_MSG_PREFIX);
-	init_msg_prefix(cmd->default_settings.msg_prefix);
-
-	cmd->default_settings.cmd_name = find_config_int(cmd->cft->root,
-							 "log/command_names",
-							 DEFAULT_CMD_NAME);
-	init_cmd_name(cmd->default_settings.cmd_name);
-
-	/* Test mode */
-	cmd->default_settings.test =
-	    find_config_int(cmd->cft->root, "global/test", 0);
-
-	/* Settings for logging to file */
-	if (find_config_int(cmd->cft->root, "log/overwrite",
-			    DEFAULT_OVERWRITE))
-		append = 0;
-
-	log_file = find_config_str(cmd->cft->root, "log/file", 0);
-
-	if (log_file) {
-		release_log_memory();
-		fin_log();
-		init_log_file(log_file, append);
-	}
-
-	log_file = find_config_str(cmd->cft->root, "log/activate_file", 0);
-	if (log_file)
-		init_log_direct(log_file, append);
-
-	init_log_while_suspended(find_config_int(cmd->cft->root,
-						 "log/activation", 0));
-
-	t = time(NULL);
-	log_verbose("Logging initialised at %s", ctime(&t));
-
-	/* Tell device-mapper about our logging */
-#ifdef DEVMAPPER_SUPPORT
-	dm_log_init(print_log);
-#endif
-}
-
-static int _process_config(struct cmd_context *cmd)
-{
-	mode_t old_umask;
-
-	/* umask */
-	cmd->default_settings.umask = find_config_int(cmd->cft->root,
-						      "global/umask",
-						      DEFAULT_UMASK);
-
-	if ((old_umask = umask((mode_t) cmd->default_settings.umask)) !=
-	    (mode_t) cmd->default_settings.umask)
-		log_verbose("Set umask to %04o", cmd->default_settings.umask);
-
-	/* dev dir */
-	if (lvm_snprintf(cmd->dev_dir, sizeof(cmd->dev_dir), "%s/",
-			 find_config_str(cmd->cft->root, "devices/dir",
-					 DEFAULT_DEV_DIR)) < 0) {
-		log_error("Device directory given in config file too long");
-		return 0;
-	}
-#ifdef DEVMAPPER_SUPPORT
-	dm_set_dev_dir(cmd->dev_dir);
-#endif
-
-	/* proc dir */
-	if (lvm_snprintf(cmd->proc_dir, sizeof(cmd->proc_dir), "%s",
-			 find_config_str(cmd->cft->root, "global/proc",
-					 DEFAULT_PROC_DIR)) < 0) {
-		log_error("Device directory given in config file too long");
-		return 0;
-	}
-
-	/* activation? */
-	cmd->default_settings.activation = find_config_int(cmd->cft->root,
-							   "global/activation",
-							   DEFAULT_ACTIVATION);
-	set_activation(cmd->default_settings.activation);
-
-	cmd->default_settings.suffix = find_config_int(cmd->cft->root,
-						       "global/suffix",
-						       DEFAULT_SUFFIX);
-
-	if (!(cmd->default_settings.unit_factor =
-	      units_to_bytes(find_config_str(cmd->cft->root,
-					     "global/units",
-					     DEFAULT_UNITS),
-			     &cmd->default_settings.unit_type))) {
-		log_error("Invalid units specification");
-		return 0;
-	}
-
-	return 1;
-}
-
-/* Find and read config file */
-static int _init_config(struct cmd_context *cmd)
-{
-	struct stat info;
-	char config_file[PATH_MAX] = "";
-
-	if (!(cmd->cft = create_config_tree())) {
-		stack;
-		return 0;
-	}
-
-	/* No config file if LVM_SYSTEM_DIR is empty */
-	if (!*cmd->sys_dir)
-		return 1;
-
-	if (lvm_snprintf(config_file, sizeof(config_file),
-			 "%s/lvm.conf", cmd->sys_dir) < 0) {
-		log_error("LVM_SYSTEM_DIR was too long");
-		destroy_config_tree(cmd->cft);
-		return 0;
-	}
-
-	/* Is there a config file? */
-	if (stat(config_file, &info) == -1) {
-		if (errno == ENOENT)
-			return 1;
-		log_sys_error("stat", config_file);
-		destroy_config_tree(cmd->cft);
-		return 0;
-	}
-
-	if (!read_config_file(cmd->cft, config_file)) {
-		log_error("Failed to load config file %s", config_file);
-		destroy_config_tree(cmd->cft);
-		return 0;
-	}
-
-	return 1;
-}
-
-static int _init_dev_cache(struct cmd_context *cmd)
-{
-	struct config_node *cn;
-	struct config_value *cv;
-
-	if (!dev_cache_init()) {
-		stack;
-		return 0;
-	}
-
-	if (!(cn = find_config_node(cmd->cft->root, "devices/scan"))) {
-		if (!dev_cache_add_dir("/dev")) {
-			log_error("Failed to add /dev to internal "
-				  "device cache");
-			return 0;
-		}
-		log_verbose("device/scan not in config file: "
-			    "Defaulting to /dev");
-		return 1;
-	}
-
-	for (cv = cn->v; cv; cv = cv->next) {
-		if (cv->type != CFG_STRING) {
-			log_error("Invalid string in config file: "
-				  "devices/scan");
-			return 0;
-		}
-
-		if (!dev_cache_add_dir(cv->v.str)) {
-			log_error("Failed to add %s to internal device cache",
-				  cv->v.str);
-			return 0;
-		}
-	}
-
-	return 1;
-}
-
-#define MAX_FILTERS 3
-
-static struct dev_filter *_init_filter_components(struct cmd_context *cmd)
-{
-	unsigned nr_filt = 0;
-	struct config_node *cn;
-	struct dev_filter *filters[MAX_FILTERS];
-
-	memset(filters, 0, sizeof(filters));
-
-	/* sysfs filter */
-	if (find_config_bool(cmd->cft->root, "devices/sysfs_scan",
-			     DEFAULT_SYSFS_SCAN)) {
-		if ((filters[nr_filt] = sysfs_filter_create(cmd->proc_dir)))
-			nr_filt++;
-	}
-
-	/* regex filter */
-	if (!(cn = find_config_node(cmd->cft->root, "devices/filter")))
-		log_debug("devices/filter not found in config file: no regex "
-			  "filter installed");
-
-	else if (!(filters[nr_filt++] = regex_filter_create(cn->v))) {
-		log_error("Failed to create regex device filter");
-		return NULL;
-	}
-
-	/* device type filter */
-	cn = find_config_node(cmd->cft->root, "devices/types");
-	if (!(filters[nr_filt++] = lvm_type_filter_create(cmd->proc_dir, cn))) {
-		log_error("Failed to create lvm type filter");
-		return NULL;
-	}
-
-	/* only build a composite filter if we really need it */
-	return (nr_filt == 1) ?
-	    filters[0] : composite_filter_create(nr_filt, filters);
-}
-
-static int _init_filters(struct cmd_context *cmd)
-{
-	const char *dev_cache;
-	struct dev_filter *f3, *f4;
-	struct stat st;
-	char cache_file[PATH_MAX];
-
-	cmd->dump_filter = 0;
-
-	if (!(f3 = _init_filter_components(cmd)))
-		return 0;
-
-	if (lvm_snprintf(cache_file, sizeof(cache_file),
-			 "%s/.cache", cmd->sys_dir) < 0) {
-		log_error("Persistent cache filename too long ('%s/.cache').",
-			  cmd->sys_dir);
-		return 0;
-	}
-
-	dev_cache =
-	    find_config_str(cmd->cft->root, "devices/cache", cache_file);
-	if (!(f4 = persistent_filter_create(f3, dev_cache))) {
-		log_error("Failed to create persistent device filter");
-		return 0;
-	}
-
-	/* Should we ever dump persistent filter state? */
-	if (find_config_int(cmd->cft->root, "devices/write_cache_state", 1))
-		cmd->dump_filter = 1;
-
-	if (!*cmd->sys_dir)
-		cmd->dump_filter = 0;
-
-	if (!stat(dev_cache, &st) &&
-	    (st.st_mtime > config_file_timestamp(cmd->cft)) &&
-	    !persistent_filter_load(f4))
-		log_verbose("Failed to load existing device cache from %s",
-			    dev_cache);
-
-	cmd->filter = f4;
-
-	return 1;
-}
-
-static int _init_formats(struct cmd_context *cmd)
-{
-	const char *format;
-
-	struct format_type *fmt;
-	struct list *fmth;
-
-#ifdef HAVE_LIBDL
-	struct config_node *cn;
-#endif
-
-	label_init();
-
-#ifdef LVM1_INTERNAL
-	if (!(fmt = init_lvm1_format(cmd)))
-		return 0;
-	fmt->library = NULL;
-	list_add(&cmd->formats, &fmt->list);
-#endif
-
-#ifdef HAVE_LIBDL
-	/* Load any formats in shared libs */
-	if ((cn = find_config_node(cmd->cft->root, "global/format_libraries"))) {
-
-		struct config_value *cv;
-		struct format_type *(*init_format_fn) (struct cmd_context *);
-		void *lib;
-
-		for (cv = cn->v; cv; cv = cv->next) {
-			if (cv->type != CFG_STRING) {
-				log_error("Invalid string in config file: "
-					  "global/format_libraries");
-				return 0;
-			}
-			if (!(lib = load_shared_library(cmd->cft, cv->v.str,
-							"format"))) {
-				stack;
-				return 0;
-			}
-
-			if (!(init_format_fn = dlsym(lib, "init_format"))) {
-				log_error("Shared library %s does not contain "
-					  "format functions", cv->v.str);
-				dlclose(lib);
-				return 0;
-			}
-
-			if (!(fmt = init_format_fn(cmd)))
-				return 0;
-			fmt->library = lib;
-			list_add(&cmd->formats, &fmt->list);
-		}
-	}
-#endif
-
-	if (!(fmt = create_text_format(cmd)))
-		return 0;
-	fmt->library = NULL;
-	list_add(&cmd->formats, &fmt->list);
-
-	cmd->fmt_backup = fmt;
-
-	format = find_config_str(cmd->cft->root, "global/format",
-				 DEFAULT_FORMAT);
-
-	list_iterate(fmth, &cmd->formats) {
-		fmt = list_item(fmth, struct format_type);
-		if (!strcasecmp(fmt->name, format) ||
-		    (fmt->alias && !strcasecmp(fmt->alias, format))) {
-			cmd->default_settings.fmt = fmt;
-			return 1;
-		}
-	}
-
-	log_error("_init_formats: Default format (%s) not found", format);
-	return 0;
-}
-
-static int _init_hostname(struct cmd_context *cmd)
-{
-	struct utsname uts;
-
-	if (uname(&uts)) {
-		log_sys_error("uname", "_init_hostname");
-		return 0;
-	}
-
-	if (!(cmd->hostname = pool_strdup(cmd->libmem, uts.nodename))) {
-		log_error("_init_hostname: pool_strdup failed");
-		return 0;
-	}
-
-	return 1;
-}
-
-static int _set_tag(struct cmd_context *cmd, const char *tag)
-{
-	log_very_verbose("Setting host tag: %s", pool_strdup(cmd->libmem, tag));
-
-	if (!str_list_add(cmd->libmem, &cmd->tags, tag)) {
-		log_error("_init_tags: str_list_add %s failed", tag);
-		return 0;
-	}
-
-	return 1;
-}
-
-static int _check_host_filters(struct cmd_context *cmd, struct config_node *hn,
-			       int *passes)
-{
-	struct config_node *cn;
-	struct config_value *cv;
-
-	*passes = 1;
-
-	for (cn = hn; cn; cn = cn->sib) {
-		if (!cn->v)
-			continue;
-		if (!strcmp(cn->key, "host_list")) {
-			*passes = 0;
-			if (cn->v->type == CFG_EMPTY_ARRAY)
-				continue;
-			for (cv = cn->v; cv; cv = cv->next) {
-				if (cv->type != CFG_STRING) {
-					log_error("Invalid hostname string "
-						  "for tag %s", cn->key);
-					return 0;
-				}
-				if (!strcmp(cv->v.str, cmd->hostname)) {
-					*passes = 1;
-					return 1;
-				}
-			}
-		}
-		if (!strcmp(cn->key, "host_filter")) {
-			log_error("host_filter not supported yet");
-			return 0;
-		}
-	}
-
-	return 1;
-}
-	
-static int _init_tags(struct cmd_context *cmd)
-{
-	struct config_node *tn, *cn;
-	const char *tag;
-	int passes;
-
-	list_init(&cmd->tags);
-
-	if (!(tn = find_config_node(cmd->cft->root, "tags")) ||
-	    !tn->child) {
-		log_very_verbose("No tags defined in config file");
-		return 1;
-	}
-
-	if (find_config_int(cmd->cft->root, "tags/hosttags",
-			    DEFAULT_HOSTTAGS)) {
-		/* FIXME Strip out invalid chars: only A-Za-z0-9_+.- */
-		if (!_set_tag(cmd, cmd->hostname)) {
-			stack;
-			return 0;
-		}
-	}
-
-	for (cn = tn->child; cn; cn = cn->sib) {
-		if (cn->v)
-			continue;
-		tag = cn->key;
-		if (*tag == '@')
-			tag++;
-		if (!validate_name(tag)) {
-			log_error("Invalid tag in config file: %s", cn->key);
-			return 0;
-		}
-		if (cn->child) {
-			passes = 0;
-			if (!_check_host_filters(cmd, cn->child, &passes)) {
-				stack;
-				return 0;
-			}
-			if (!passes)
-				continue;
-		}
-		if (!_set_tag(cmd, tag)) {
-			stack;
-			return 0;
-		}
-	}
-
-	return 1;
-}
-
-/* Entry point */
-struct cmd_context *create_toolcontext(struct arg *the_args)
-{
-	struct cmd_context *cmd;
-
-#ifdef M_MMAP_MAX
-	mallopt(M_MMAP_MAX, 0);
-#endif
-
-	if (!setlocale(LC_ALL, ""))
-		log_error("setlocale failed");
-
-#ifdef INTL_PACKAGE
-	bindtextdomain(INTL_PACKAGE, LOCALEDIR);
-#endif
-
-	init_syslog(DEFAULT_LOG_FACILITY);
-
-	if (!(cmd = dbg_malloc(sizeof(*cmd)))) {
-		log_error("Failed to allocate command context");
-		return NULL;
-	}
-	memset(cmd, 0, sizeof(*cmd));
-	cmd->args = the_args;
-	list_init(&cmd->formats);
-
-	strcpy(cmd->sys_dir, DEFAULT_SYS_DIR);
-
-	if (!_get_env_vars(cmd))
-		goto error;
-
-	/* Create system directory if it doesn't already exist */
-	if (*cmd->sys_dir && !create_dir(cmd->sys_dir))
-		goto error;
-
-	if (!_init_config(cmd))
-		goto error;
-
-	_init_logging(cmd);
-
-	if (!(cmd->libmem = pool_create(4 * 1024))) {
-		log_error("Library memory pool creation failed");
-		return 0;
-	}
-
-	if (!_process_config(cmd))
-		goto error;
-
-	if (!_init_dev_cache(cmd))
-		goto error;
-
-	if (!_init_filters(cmd))
-		goto error;
-
-	if (!(cmd->mem = pool_create(4 * 1024))) {
-		log_error("Command memory pool creation failed");
-		return 0;
-	}
-
-	memlock_init(cmd);
-
-	if (!_init_formats(cmd))
-		goto error;
-
-	if (!_init_hostname(cmd))
-		goto error;
-
-	if (!_init_tags(cmd))
-		goto error;
-
-	cmd->current_settings = cmd->default_settings;
-
-	return cmd;
-
-      error:
-	dbg_free(cmd);
-	return NULL;
-}
-
-int refresh_toolcontext(struct cmd_context *cmd)
-{
-	_init_logging(cmd);
-	_init_tags(cmd);
-
-	/* FIXME Reset filters and dev_cache */
-
-	return 1;
-}
-
-static void _destroy_formats(struct list *formats)
-{
-	struct list *fmtl, *tmp;
-	struct format_type *fmt;
-	void *lib;
-
-	list_iterate_safe(fmtl, tmp, formats) {
-		fmt = list_item(fmtl, struct format_type);
-		list_del(&fmt->list);
-		lib = fmt->library;
-		fmt->ops->destroy(fmt);
-#ifdef HAVE_LIBDL
-		if (lib)
-			dlclose(lib);
-#endif
-	}
-}
-
-void destroy_toolcontext(struct cmd_context *cmd)
-{
-	if (cmd->dump_filter)
-		persistent_filter_dump(cmd->filter);
-
-	activation_exit();
-	lvmcache_destroy();
-	label_exit();
-	_destroy_formats(&cmd->formats);
-	cmd->filter->destroy(cmd->filter);
-	pool_destroy(cmd->mem);
-	dev_cache_exit();
-	destroy_config_tree(cmd->cft);
-	pool_destroy(cmd->libmem);
-	dbg_free(cmd);
-
-	release_log_memory();
-	dump_memory();
-	fin_log();
-	fin_syslog();
-
-	if (_log)
-		fclose(_log);
-
-}

lib/commands/toolcontext.h

@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2001-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_TOOLCONTEXT_H
-#define _LVM_TOOLCONTEXT_H
-
-#include "dev-cache.h"
-#include "config.h"
-#include "pool.h"
-#include "metadata.h"
-
-#include <stdio.h>
-#include <limits.h>
-
-/*
- * Config options that can be changed while commands are processed
- */
-struct config_info {
-	int debug;
-	int verbose;
-	int test;
-	int syslog;
-	int activation;
-	int suffix;
-	uint64_t unit_factor;
-	char unit_type;
-	const char *msg_prefix;
-	int cmd_name;		/* Show command name? */
-
-	int archive;		/* should we archive ? */
-	int backup;		/* should we backup ? */
-
-	struct format_type *fmt;
-
-	mode_t umask;
-};
-
-/* FIXME Split into tool & library contexts */
-/* command-instance-related variables needed by library */
-struct cmd_context {
-	struct pool *libmem;	/* For permanent config data */
-	struct pool *mem;	/* Transient: Cleared between each command */
-
-	const struct format_type *fmt;	/* Current format to use by default */
-	struct format_type *fmt_backup;	/* Format to use for backups */
-
-	struct list formats;	/* Available formats */
-	const char *hostname;
-
-	char *cmd_line;
-	struct command *command;
-	struct arg *args;
-	char **argv;
-
-	struct dev_filter *filter;
-	int dump_filter;	/* Dump filter when exiting? */
-
-	struct config_tree *cft;
-	struct config_info default_settings;
-	struct config_info current_settings;
-
-	/* List of defined tags */
-	struct list tags;
-
-	char sys_dir[PATH_MAX];
-	char dev_dir[PATH_MAX];
-	char proc_dir[PATH_MAX];
-};
-
-struct cmd_context *create_toolcontext(struct arg *the_args);
-void destroy_toolcontext(struct cmd_context *cmd);
-int refresh_toolcontext(struct cmd_context *cmd);
-
-#endif

lib/config/config.h

@@ -1,86 +1,61 @@
 /*
- * 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_CONFIG_H
 #define _LVM_CONFIG_H
 
-#include "device.h"
 
 enum {
-	CFG_STRING,
-	CFG_FLOAT,
-	CFG_INT,
-	CFG_EMPTY_ARRAY
+        CFG_STRING,
+        CFG_FLOAT,
+        CFG_INT,
 };
 
 struct config_value {
-	int type;
-	union {
-		int i;
-		float r;
-		char *str;
-	} v;
-	struct config_value *next;	/* for arrays */
+        int type;
+        union {
+                int i;
+                float r;
+                char *str;
+        } v;
+        struct config_value *next; /* for arrays */
 };
 
 struct config_node {
-	char *key;
-	struct config_node *sib, *child;
-	struct config_value *v;
+        char *key;
+        struct config_node *sib, *child;
+        struct config_value *v;
 };
 
-struct config_tree {
-	struct config_node *root;
+struct config_file {
+        struct config_node *root;
 };
 
-struct config_tree *create_config_tree(void);
-void destroy_config_tree(struct config_tree *cf);
+struct config_file *create_config_file(void);
+void destroy_config_file(struct config_file *cf);
 
-typedef uint32_t (*checksum_fn_t) (uint32_t initial, void *buf, uint32_t size);
-
-int read_config_fd(struct config_tree *cf, struct device *dev,
-		   off_t offset, size_t size, off_t offset2, size_t size2,
-		   checksum_fn_t checksum_fn, uint32_t checksum);
-
-int read_config_file(struct config_tree *cf, const char *file);
-int write_config_file(struct config_tree *cf, const char *file);
-int reload_config_file(struct config_tree **cf);
-time_t config_file_timestamp(struct config_tree *cf);
+int read_config(struct config_file *cf, const char *file);
+int write_config(struct config_file *cf, const char *file);
 
 struct config_node *find_config_node(struct config_node *cn,
-				     const char *path);
+				     const char *path, char seperator);
 
-const char *find_config_str(struct config_node *cn, const char *path,
-			    const char *fail);
+const char *find_config_str(struct config_node *cn,
+			    const char *path, char sep, const char *fail);
 
-int find_config_int(struct config_node *cn, const char *path, int fail);
+int find_config_int(struct config_node *cn, const char *path,
+		    char sep, int fail);
 
-float find_config_float(struct config_node *cn, const char *path, float fail);
-
-/*
- * Understands (0, ~0), (y, n), (yes, no), (on,
- * off), (true, false).
- */
-int find_config_bool(struct config_node *cn, const char *path, int fail);
-
-int get_config_uint32(struct config_node *cn, const char *path,
-		      uint32_t *result);
-
-int get_config_uint64(struct config_node *cn, const char *path,
-		      uint64_t *result);
-
-int get_config_str(struct config_node *cn, const char *path, char **result);
+float find_config_float(struct config_node *cn, const char *path,
+			char sep, float fail);
 
 #endif
+
+/*
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */

lib/config/defaults.h

@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2001-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_DEFAULTS_H
-#define _LVM_DEFAULTS_H
-
-#define DEFAULT_ARCHIVE_ENABLED 1
-#define DEFAULT_BACKUP_ENABLED 1
-
-#define DEFAULT_ARCHIVE_SUBDIR "archive"
-#define DEFAULT_BACKUP_SUBDIR "backup"
-
-#define DEFAULT_ARCHIVE_DAYS 30
-#define DEFAULT_ARCHIVE_NUMBER 10
-
-#define DEFAULT_SYS_DIR "/etc/lvm"
-#define DEFAULT_DEV_DIR "/dev"
-#define DEFAULT_PROC_DIR "/proc"
-#define DEFAULT_SYSFS_SCAN 1
-
-#define DEFAULT_LOCK_DIR "/var/lock/lvm"
-#define DEFAULT_LOCKING_LIB "lvm2_locking.so"
-
-#define DEFAULT_UMASK 0077
-
-#ifdef LVM1_SUPPORT
-#  define DEFAULT_FORMAT "lvm1"
-#else
-#  define DEFAULT_FORMAT "lvm2"
-#endif
-
-#define DEFAULT_STRIPESIZE 64	/* KB */
-#define DEFAULT_PVMETADATASIZE 255
-#define DEFAULT_PVMETADATACOPIES 1
-#define DEFAULT_LABELSECTOR UINT64_C(1)
-
-#define DEFAULT_MSG_PREFIX "  "
-#define DEFAULT_CMD_NAME 0
-#define DEFAULT_OVERWRITE 0
-
-#ifndef DEFAULT_LOG_FACILITY
-#  define DEFAULT_LOG_FACILITY LOG_USER
-#endif
-
-#define DEFAULT_SYSLOG 1
-#define DEFAULT_VERBOSE 0
-#define DEFAULT_LOGLEVEL 0
-#define DEFAULT_INDENT 1
-#define DEFAULT_UNITS "h"
-#define DEFAULT_SUFFIX 1
-#define DEFAULT_HOSTTAGS 0
-
-#ifdef DEVMAPPER_SUPPORT
-#  define DEFAULT_ACTIVATION 1
-#  define DEFAULT_RESERVED_MEMORY 8192
-#  define DEFAULT_RESERVED_STACK 256
-#  define DEFAULT_PROCESS_PRIORITY -18
-#else
-#  define DEFAULT_ACTIVATION 0
-#endif
-
-#define DEFAULT_STRIPE_FILLER "/dev/ioerror"
-#define DEFAULT_MIRROR_REGION_SIZE 512	/* KB */
-#define DEFAULT_INTERVAL 15
-
-#ifdef READLINE_SUPPORT
-#  define DEFAULT_MAX_HISTORY 100
-#endif
-
-#define DEFAULT_REP_ALIGNED 1
-#define DEFAULT_REP_BUFFERED 1
-#define DEFAULT_REP_HEADINGS 1
-#define DEFAULT_REP_SEPARATOR " "
-
-#define DEFAULT_LVS_COLS "lv_name,vg_name,lv_attr,lv_size,origin,snap_percent,move_pv,move_percent"
-#define DEFAULT_VGS_COLS "vg_name,pv_count,lv_count,snap_count,vg_attr,vg_size,vg_free"
-#define DEFAULT_PVS_COLS "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free"
-#define DEFAULT_SEGS_COLS "lv_name,vg_name,lv_attr,stripes,segtype,seg_size"
-
-#define DEFAULT_LVS_COLS_VERB "lv_name,vg_name,seg_count,lv_attr,lv_size,lv_major,lv_minor,origin,snap_percent,move_pv,move_percent,lv_uuid"
-#define DEFAULT_VGS_COLS_VERB "vg_name,vg_attr,vg_extent_size,pv_count,lv_count,snap_count,vg_size,vg_free,vg_uuid"
-#define DEFAULT_PVS_COLS_VERB "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pv_uuid"
-#define DEFAULT_SEGS_COLS_VERB "lv_name,vg_name,lv_attr,seg_start,seg_size,stripes,segtype,stripesize,chunksize"
-
-#define DEFAULT_LVS_SORT "vg_name,lv_name"
-#define DEFAULT_VGS_SORT "vg_name"
-#define DEFAULT_PVS_SORT "pv_name"
-#define DEFAULT_SEGS_SORT "vg_name,lv_name,seg_start"
-
-#endif				/* _LVM_DEFAULTS_H */

lib/datastruct/bitset.c

@@ -1,28 +1,21 @@
 /*
- * 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 LGPL.
  */
 
-#include "lib.h"
 #include "bitset.h"
+#include "dbg_malloc.h"
+
+#include <stdlib.h>
 
 /* FIXME: calculate this. */
 #define INT_SHIFT 5
 
 bitset_t bitset_create(struct pool *mem, unsigned num_bits)
 {
-	unsigned n = (num_bits / BITS_PER_INT) + 2;
-	size_t size = sizeof(int) * n;
+	int n = (num_bits / BITS_PER_INT) + 2;
+	int size = sizeof(int) * n;
 	unsigned *bs = pool_zalloc(mem, size);
 
 	if (!bs)
@@ -40,7 +33,7 @@ void bitset_destroy(bitset_t bs)
 void bit_union(bitset_t out, bitset_t in1, bitset_t in2)
 {
 	int i;
-	for (i = (in1[0] / BITS_PER_INT) + 1; i; i--)
+	for(i = (in1[0] / BITS_PER_INT) + 1; i; i--)
 		out[i] = in1[i] | in2[i];
 }
 
@@ -65,7 +58,7 @@ int bit_get_next(bitset_t bs, int last_bit)
 
 	last_bit++;		/* otherwise we'll return the same bit again */
 
-	while (last_bit < bs[0]) {
+	while(last_bit < bs[0]) {
 		word = last_bit >> INT_SHIFT;
 		test = bs[word + 1];
 		bit = last_bit & (BITS_PER_INT - 1);
@@ -73,8 +66,8 @@ int bit_get_next(bitset_t bs, int last_bit)
 		if ((bit = _test_word(test, bit)) >= 0)
 			return (word * BITS_PER_INT) + bit;
 
-		last_bit = last_bit - (last_bit & (BITS_PER_INT - 1)) +
-		    BITS_PER_INT;
+		last_bit = last_bit - (last_bit & (BITS_PER_INT - 1)) + 
+			BITS_PER_INT;
 	}
 
 	return -1;

lib/datastruct/bitset.h

@@ -1,34 +1,28 @@
 /*
- * 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_BITSET_H
 #define _LVM_BITSET_H
 
+#include "lvm-types.h"
 #include "pool.h"
 
 #include <limits.h>
+#include <string.h>
+
 
 typedef uint32_t *bitset_t;
 
 bitset_t bitset_create(struct pool *mem, unsigned num_bits);
-void bitset_destroy(bitset_t bs);
 
 void bit_union(bitset_t out, bitset_t in1, bitset_t in2);
 int bit_get_first(bitset_t bs);
 int bit_get_next(bitset_t bs, int last_bit);
 
+
 #define BITS_PER_INT (sizeof(int) * CHAR_BIT)
 
 #define bit(bs, i) \

lib/datastruct/btree.c

@@ -1,20 +1,11 @@
 /*
- * 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 LGPL.
  */
 
-#include "lib.h"
 #include "btree.h"
+#include "log.h"
 
 struct node {
 	uint32_t key;
@@ -49,13 +40,14 @@ static uint32_t _shuffle(uint32_t k)
 #if 1
 	return ((k & 0xff) << 24 |
 		(k & 0xff00) << 8 |
-		(k & 0xff0000) >> 8 | (k & 0xff000000) >> 24);
+		(k & 0xff0000) >> 8 |
+		(k & 0xff000000) >> 24);
 #else
 	return k;
 #endif
 }
 
-static struct node **_lookup(struct node **c, uint32_t key, struct node **p)
+struct node **_lookup(struct node **c, uint32_t key, struct node **p)
 {
 	*p = NULL;
 	while (*c) {

lib/datastruct/btree.h

@@ -1,21 +1,13 @@
 /*
- * 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_BTREE_H
 #define _LVM_BTREE_H
 
+#include "lvm-types.h"
 #include "pool.h"
 
 struct btree;

lib/datastruct/hash.c

@@ -1,20 +1,13 @@
 /*
- * 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 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 LGPL.
  */
 
-#include "lib.h"
+
+#include "dbg_malloc.h"
 #include "hash.h"
+#include "log.h"
 
 struct hash_node {
 	struct hash_node *next;
@@ -30,30 +23,22 @@ struct hash_table {
 
 /* Permutation of the Integers 0 through 255 */
 static unsigned char _nums[] = {
-	1, 14, 110, 25, 97, 174, 132, 119, 138, 170, 125, 118, 27, 233, 140, 51,
-	87, 197, 177, 107, 234, 169, 56, 68, 30, 7, 173, 73, 188, 40, 36, 65,
-	49, 213, 104, 190, 57, 211, 148, 223, 48, 115, 15, 2, 67, 186, 210, 28,
-	12, 181, 103, 70, 22, 58, 75, 78, 183, 167, 238, 157, 124, 147, 172,
-	144,
-	176, 161, 141, 86, 60, 66, 128, 83, 156, 241, 79, 46, 168, 198, 41, 254,
-	178, 85, 253, 237, 250, 154, 133, 88, 35, 206, 95, 116, 252, 192, 54,
-	221,
-	102, 218, 255, 240, 82, 106, 158, 201, 61, 3, 89, 9, 42, 155, 159, 93,
-	166, 80, 50, 34, 175, 195, 100, 99, 26, 150, 16, 145, 4, 33, 8, 189,
-	121, 64, 77, 72, 208, 245, 130, 122, 143, 55, 105, 134, 29, 164, 185,
-	194,
-	193, 239, 101, 242, 5, 171, 126, 11, 74, 59, 137, 228, 108, 191, 232,
-	139,
-	6, 24, 81, 20, 127, 17, 91, 92, 251, 151, 225, 207, 21, 98, 113, 112,
-	84, 226, 18, 214, 199, 187, 13, 32, 94, 220, 224, 212, 247, 204, 196,
-	43,
-	249, 236, 45, 244, 111, 182, 153, 136, 129, 90, 217, 202, 19, 165, 231,
-	71,
-	230, 142, 96, 227, 62, 179, 246, 114, 162, 53, 160, 215, 205, 180, 47,
-	109,
-	44, 38, 31, 149, 135, 0, 216, 52, 63, 23, 37, 69, 39, 117, 146, 184,
-	163, 200, 222, 235, 248, 243, 219, 10, 152, 131, 123, 229, 203, 76, 120,
-	209
+	1, 14,110, 25, 97,174,132,119,138,170,125,118, 27,233,140, 51,
+	87,197,177,107,234,169, 56, 68, 30,  7,173, 73,188, 40, 36, 65,
+	49,213,104,190, 57,211,148,223, 48,115, 15,  2, 67,186,210, 28,
+	12,181,103, 70, 22, 58, 75, 78,183,167,238,157,124,147,172,144,
+	176,161,141, 86, 60, 66,128, 83,156,241, 79, 46,168,198, 41,254,
+	178, 85,253,237,250,154,133, 88, 35,206, 95,116,252,192, 54,221,
+	102,218,255,240, 82,106,158,201, 61,  3, 89,  9, 42,155,159, 93,
+	166, 80, 50, 34,175,195,100, 99, 26,150, 16,145,  4, 33,  8,189,
+	121, 64, 77, 72,208,245,130,122,143, 55,105,134, 29,164,185,194,
+	193,239,101,242,  5,171,126, 11, 74, 59,137,228,108,191,232,139,
+	6, 24, 81, 20,127, 17, 91, 92,251,151,225,207, 21, 98,113,112,
+	84,226, 18,214,199,187, 13, 32, 94,220,224,212,247,204,196, 43,
+	249,236, 45,244,111,182,153,136,129, 90,217,202, 19,165,231, 71,
+	230,142, 96,227, 62,179,246,114,162, 53,160,215,205,180, 47,109,
+	44, 38, 31,149,135,  0,216, 52, 63, 23, 37, 69, 39,117,146,184,
+	163,200,222,235,248,243,219, 10,152,131,123,229,203, 76,120,209
 };
 
 static struct hash_node *_create_node(const char *str)
@@ -70,7 +55,7 @@ static struct hash_node *_create_node(const char *str)
 
 static unsigned _hash(const char *str)
 {
-	unsigned long h = 0, g;
+	unsigned long int h = 0, g;
 	while (*str) {
 		h <<= 4;
 		h += _nums[(int) *str++];
@@ -98,7 +83,7 @@ struct hash_table *hash_create(unsigned size_hint)
 
 	/* round size hint up to a power of two */
 	while (new_size < size_hint)
-		new_size = new_size << 1;
+		new_size  = new_size << 1;
 
 	hc->num_slots = new_size;
 	len = sizeof(*(hc->slots)) * new_size;
@@ -109,7 +94,7 @@ struct hash_table *hash_create(unsigned size_hint)
 	memset(hc->slots, 0, len);
 	return hc;
 
-      bad:
+ bad:
 	dbg_free(hc->slots);
 	dbg_free(hc);
 	return 0;
@@ -134,13 +119,13 @@ void hash_destroy(struct hash_table *t)
 	dbg_free(t);
 }
 
-static struct hash_node **_find(struct hash_table *t, const char *key)
+static inline struct hash_node **_find(struct hash_table *t, const char *key)
 {
 	unsigned h = _hash(key) & (t->num_slots - 1);
 	struct hash_node **c;
 
-	for (c = &t->slots[h]; *c; c = &((*c)->next))
-		if (!strcmp(key, (*c)->key))
+	for(c = &t->slots[h]; *c; c = &((*c)->next))
+		if(!strcmp(key, (*c)->key))
 			break;
 
 	return c;
@@ -156,7 +141,7 @@ int hash_insert(struct hash_table *t, const char *key, void *data)
 {
 	struct hash_node **c = _find(t, key);
 
-	if (*c)
+	if(*c)
 		(*c)->data = data;
 	else {
 		struct hash_node *n = _create_node(key);
@@ -190,7 +175,7 @@ unsigned hash_get_num_entries(struct hash_table *t)
 	return t->num_nodes;
 }
 
-void hash_iter(struct hash_table *t, iterate_fn f)
+void hash_iterate(struct hash_table *t, iterate_fn f)
 {
 	struct hash_node *c;
 	int i;
@@ -217,7 +202,7 @@ void *hash_get_data(struct hash_table *t, struct hash_node *n)
 	return n->data;
 }
 
-static struct hash_node *_next_slot(struct hash_table *t, unsigned s)
+static struct hash_node *_next_slot(struct hash_table *t, unsigned int s)
 {
 	struct hash_node *c = NULL;
 	int i;
@@ -235,6 +220,7 @@ struct hash_node *hash_get_first(struct hash_table *t)
 
 struct hash_node *hash_get_next(struct hash_table *t, struct hash_node *n)
 {
-	unsigned h = _hash(n->key) & (t->num_slots - 1);
+	unsigned int h = _hash(n->key) & (t->num_slots - 1);
 	return n->next ? n->next : _next_slot(t, h + 1);
 }
+

lib/datastruct/hash.h

@@ -1,16 +1,7 @@
 /*
- * 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 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_HASH_H
@@ -19,27 +10,23 @@
 struct hash_table;
 struct hash_node;
 
-typedef void (*iterate_fn) (void *data);
+typedef void (*iterate_fn)(void *data);
 
 struct hash_table *hash_create(unsigned size_hint);
 void hash_destroy(struct hash_table *t);
 void hash_wipe(struct hash_table *t);
 
 void *hash_lookup(struct hash_table *t, const char *key);
-void *hash_lookup_fixed(struct hash_table *t, const char *key, uint32_t len);
 int hash_insert(struct hash_table *t, const char *key, void *data);
 void hash_remove(struct hash_table *t, const char *key);
 
 unsigned hash_get_num_entries(struct hash_table *t);
-void hash_iter(struct hash_table *t, iterate_fn f);
+void hash_iterate(struct hash_table *t, iterate_fn f);
 
 char *hash_get_key(struct hash_table *t, struct hash_node *n);
 void *hash_get_data(struct hash_table *t, struct hash_node *n);
 struct hash_node *hash_get_first(struct hash_table *t);
 struct hash_node *hash_get_next(struct hash_table *t, struct hash_node *n);
 
-#define hash_iterate(v, h) \
-	for (v = hash_get_first(h); v; \
-	     v = hash_get_next(h, v))
-
 #endif
+

lib/datastruct/list.h

@@ -1,16 +1,7 @@
 /*
- * 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 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 LGPL.
  */
 
 #ifndef _LVM_LIST_H
@@ -22,15 +13,11 @@ struct list {
 	struct list *n, *p;
 };
 
-#define LIST_INIT(name)	struct list name = { &(name), &(name) }
-
-static inline void list_init(struct list *head)
-{
+static inline void list_init(struct list *head) {
 	head->n = head->p = head;
 }
 
-static inline void list_add(struct list *head, struct list *elem)
-{
+static inline void list_add(struct list *head, struct list *elem) {
 	assert(head->n);
 
 	elem->n = head;
@@ -40,8 +27,7 @@ static inline void list_add(struct list *head, struct list *elem)
 	head->p = elem;
 }
 
-static inline void list_add_h(struct list *head, struct list *elem)
-{
+static inline void list_add_h(struct list *head, struct list *elem) {
 	assert(head->n);
 
 	elem->n = head->n;
@@ -51,62 +37,23 @@ static inline void list_add_h(struct list *head, struct list *elem)
 	head->n = elem;
 }
 
-static inline void list_del(struct list *elem)
-{
+static inline void list_del(struct list *elem) {
 	elem->n->p = elem->p;
 	elem->p->n = elem->n;
 }
 
-static inline int list_empty(struct list *head)
-{
+static inline int list_empty(struct list *head) {
 	return head->n == head;
 }
 
-static inline int list_end(struct list *head, struct list *elem)
-{
-	return elem->n == head;
-}
-
-static inline struct list *list_next(struct list *head, struct list *elem)
-{
-	return (list_end(head, elem) ? NULL : elem->n);
-}
+#define list_iterate(v, head) \
+    for (v = (head)->n; v != head; v = v->n)
 
 #define list_item(v, t) \
     ((t *)((uintptr_t)(v) - (uintptr_t)&((t *) 0)->list))
 
-#define list_struct_base(v, t, h) \
-    ((t *)((uintptr_t)(v) - (uintptr_t)&((t *) 0)->h))
-
-/* Given a known element in a known structure, locate another */
-#define struct_field(v, t, e, f) \
-    (((t *)((uintptr_t)(v) - (uintptr_t)&((t *) 0)->e))->f)
-
-/* Given a known element in a known structure, locate the list head */
-#define list_head(v, t, e) struct_field(v, t, e, list)
-
-#define list_iterate(v, head) \
-	for (v = (head)->n; v != head; v = v->n)
-
-#define list_uniterate(v, head, start) \
-	for (v = (start)->p; v != head; v = v->p)
-
-#define list_iterate_safe(v, t, head) \
-	for (v = (head)->n, t = v->n; v != head; v = t, t = v->n)
-
-#define list_iterate_items(v, head) \
-	for (v = list_item((head)->n, typeof(*v)); &v->list != (head); \
-	     v = list_item(v->list.n, typeof(*v)))
-
-static inline unsigned int list_size(const struct list *head)
-{
-	unsigned int s = 0;
-	const struct list *v;
-
-	list_iterate(v, head)
-	    s++;
-
-	return s;
-}
+/* Given a known element in a known structure, locate the struct list */
+#define list_head(v, t, e) \
+    (((t *)((uintptr_t)(v) - (uintptr_t)&((t *) 0)->e))->list)
 
 #endif

lib/datastruct/lvm-types.h

@@ -1,16 +1,7 @@
 /*
- * 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_TYPES_H
@@ -21,12 +12,9 @@
 #include <sys/types.h>
 #include <inttypes.h>
 
-/* Define some portable printing types */
-#define PRIsize_t "Zu"
-
 struct str_list {
 	struct list list;
-	const char *str;
+	char *str;
 };
 
 #endif

lib/datastruct/str_list.c

@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2003-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 "lib.h"
-#include "str_list.h"
-
-struct list *str_list_create(struct pool *mem)
-{
-	struct list *sl;
-
-	if (!(sl = pool_alloc(mem, sizeof(struct list)))) {
-		stack;
-		return NULL;
-	}
-
-	list_init(sl);
-
-	return sl;
-}
-
-int str_list_add(struct pool *mem, struct list *sll, const char *str)
-{
-	struct str_list *sln;
-
-	if (!str) {
-		stack;
-		return 0;
-	}
-
-	/* Already in list? */
-	if (str_list_match_item(sll, str))
-		return 1;
-
-	if (!(sln = pool_alloc(mem, sizeof(*sln)))) {
-		stack;
-		return 0;
-	}
-
-	sln->str = str;
-	list_add(sll, &sln->list);
-
-	return 1;
-}
-
-int str_list_del(struct list *sll, const char *str)
-{
-	struct list *slh, *slht;
-
-	list_iterate_safe(slh, slht, sll) {
-		if (!strcmp(str, list_item(slh, struct str_list)->str))
-			 list_del(slh);
-	}
-
-	return 1;
-}
-
-int str_list_dup(struct pool *mem, struct list *sllnew, struct list *sllold)
-{
-	struct str_list *sl;
-
-	list_init(sllnew);
-
-	list_iterate_items(sl, sllold) {
-		if (!str_list_add(mem, sllnew, strdup(sl->str))) {
-			stack;
-			return 0;
-		}
-	}
-
-	return 1;
-}
-
-/*
- * Is item on list?
- */
-int str_list_match_item(struct list *sll, const char *str)
-{
-	struct str_list *sl;
-
-	list_iterate_items(sl, sll)
-	    if (!strcmp(str, sl->str))
-		return 1;
-
-	return 0;
-}
-
-/*
- * Is at least one item on both lists?
- */
-int str_list_match_list(struct list *sll, struct list *sll2)
-{
-	struct str_list *sl;
-
-	list_iterate_items(sl, sll)
-	    if (str_list_match_item(sll2, sl->str))
-		return 1;
-
-	return 0;
-}
-
-/*
- * Do both lists contain the same set of items?
- */
-int str_list_lists_equal(struct list *sll, struct list *sll2)
-{
-	struct str_list *sl;
-
-	if (list_size(sll) != list_size(sll2))
-		return 0;
-
-	list_iterate_items(sl, sll)
-	    if (!str_list_match_item(sll2, sl->str))
-		return 0;
-
-	return 1;
-}

lib/datastruct/str_list.h

@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2003-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_STR_LIST_H
-#define _LVM_STR_LIST_H
-
-#include "pool.h"
-
-struct list *str_list_create(struct pool *mem);
-int str_list_add(struct pool *mem, struct list *sll, const char *str);
-int str_list_del(struct list *sll, const char *str);
-int str_list_match_item(struct list *sll, const char *str);
-int str_list_match_list(struct list *sll, struct list *sll2);
-int str_list_lists_equal(struct list *sll, struct list *sll2);
-int str_list_dup(struct pool *mem, struct list *sllnew, struct list *sllold);
-
-#endif

lib/device/dev-cache.c

@@ -1,31 +1,30 @@
 /*
- * 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 LGPL.
  */
 
-#include "lib.h"
 #include "dev-cache.h"
+#include "log.h"
 #include "pool.h"
 #include "hash.h"
 #include "list.h"
 #include "lvm-types.h"
 #include "btree.h"
-#include "filter.h"
+#include "dbg_malloc.h"
 
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <sys/param.h>
 #include <dirent.h>
 
+/*
+ * FIXME: really need to seperate names from the devices since
+ * multiple names can point to the same device.
+ */
+
 struct dev_iter {
 	struct btree_iter *current;
 	struct dev_filter *filter;
@@ -46,168 +45,42 @@ static struct {
 
 } _cache;
 
+
 #define _alloc(x) pool_alloc(_cache.mem, (x))
 #define _free(x) pool_free(_cache.mem, (x))
 
 static int _insert(const char *path, int rec);
 
-struct device *dev_create_file(const char *filename, struct device *dev,
-			       struct str_list *alias)
-{
-	int allocate = !dev;
-
-	if (allocate && !(dev = dbg_malloc(sizeof(*dev)))) {
-		log_error("struct device allocation failed");
-		return NULL;
-	}
-	if (allocate && !(alias = dbg_malloc(sizeof(*alias)))) {
-		log_error("struct str_list allocation failed");
-		dbg_free(dev);
-		return NULL;
-	}
-	if (!(alias->str = dbg_strdup(filename))) {
-		log_error("filename strdup failed");
-		if (allocate) {
-			dbg_free(dev);
-			dbg_free(alias);
-		}
-		return NULL;
-	}
-	dev->flags = DEV_REGULAR;
-	if (allocate)
-		dev->flags |= DEV_ALLOCED;
-	list_init(&dev->aliases);
-	list_add(&dev->aliases, &alias->list);
-	dev->end = UINT64_C(0);
-	dev->dev = 0;
-	dev->fd = -1;
-	dev->open_count = 0;
-	memset(dev->pvid, 0, sizeof(dev->pvid));
-	list_init(&dev->open_list);
-
-	return dev;
-}
-
-static struct device *_dev_create(dev_t d)
+static struct device *_create_dev(dev_t d)
 {
 	struct device *dev;
 
 	if (!(dev = _alloc(sizeof(*dev)))) {
-		log_error("struct device allocation failed");
+		stack;
 		return NULL;
 	}
-	dev->flags = 0;
+
 	list_init(&dev->aliases);
 	dev->dev = d;
 	dev->fd = -1;
-	dev->open_count = 0;
-	dev->end = UINT64_C(0);
-	memset(dev->pvid, 0, sizeof(dev->pvid));
-	list_init(&dev->open_list);
-
 	return dev;
 }
 
-/* Return 1 if we prefer path1 else return 0 */
-static int _compare_paths(const char *path0, const char *path1)
-{
-	int slash0 = 0, slash1 = 0;
-	const char *p;
-	char p0[PATH_MAX], p1[PATH_MAX];
-	char *s0, *s1;
-	struct stat stat0, stat1;
-
-	/* Return the path with fewer slashes */
-	for (p = path0; p++; p = (const char *) strchr(p, '/'))
-		slash0++;
-
-	for (p = path1; p++; p = (const char *) strchr(p, '/'))
-		slash1++;
-
-	if (slash0 < slash1)
-		return 0;
-	if (slash1 < slash0)
-		return 1;
-
-	strncpy(p0, path0, PATH_MAX);
-	strncpy(p1, path1, PATH_MAX);
-	s0 = &p0[0] + 1;
-	s1 = &p1[0] + 1;
-
-	/* We prefer symlinks - they exist for a reason!
-	 * So we prefer a shorter path before the first symlink in the name.
-	 * FIXME Configuration option to invert this? */
-	while (s0) {
-		s0 = strchr(s0, '/');
-		s1 = strchr(s1, '/');
-		if (s0) {
-			*s0 = '\0';
-			*s1 = '\0';
-		}
-		if (lstat(p0, &stat0)) {
-			log_sys_error("lstat", p0);
-			return 1;
-		}
-		if (lstat(p1, &stat1)) {
-			log_sys_error("lstat", p1);
-			return 0;
-		}
-		if (S_ISLNK(stat0.st_mode) && !S_ISLNK(stat1.st_mode))
-			return 0;
-		if (!S_ISLNK(stat0.st_mode) && S_ISLNK(stat1.st_mode))
-			return 1;
-		if (s0) {
-			*s0++ = '/';
-			*s1++ = '/';
-		}
-	}
-
-	/* ASCII comparison */
-	if (strcmp(path0, path1) < 0)
-		return 0;
-	else
-		return 1;
-}
-
 static int _add_alias(struct device *dev, const char *path)
 {
 	struct str_list *sl = _alloc(sizeof(*sl));
-	struct list *ah;
-	const char *oldpath;
-	int prefer_old = 1;
 
 	if (!sl) {
 		stack;
 		return 0;
 	}
 
-	/* Is name already there? */
-	list_iterate(ah, &dev->aliases) {
-		if (!strcmp(list_item(ah, struct str_list)->str, path)) {
-			stack;
-			return 1;
-		}
-	}
-
 	if (!(sl->str = pool_strdup(_cache.mem, path))) {
 		stack;
 		return 0;
 	}
 
-	if (!list_empty(&dev->aliases)) {
-		oldpath = list_item(dev->aliases.n, struct str_list)->str;
-		prefer_old = _compare_paths(path, oldpath);
-		log_debug("%s: Aliased to %s in device cache%s",
-			  path, oldpath, prefer_old ? "" : " (preferred name)");
-
-	} else
-		log_debug("%s: Added to device cache", path);
-
-	if (prefer_old)
-		list_add(&dev->aliases, &sl->list);
-	else
-		list_add_h(&dev->aliases, &sl->list);
-
+	list_add(&dev->aliases, &sl->list);
 	return 1;
 }
 
@@ -220,15 +93,14 @@ static int _insert_dev(const char *path, dev_t d)
 	struct device *dev;
 
 	/* is this device already registered ? */
-	if (!(dev = (struct device *) btree_lookup(_cache.devices,
-						   (uint32_t) d))) {
+	if (!(dev = (struct device *) btree_lookup(_cache.devices, d))) {
 		/* create new device */
-		if (!(dev = _dev_create(d))) {
+		if (!(dev = _create_dev(d))) {
 			stack;
 			return 0;
 		}
 
-		if (!(btree_insert(_cache.devices, (uint32_t) d, dev))) {
+		if (!(btree_insert(_cache.devices, d, dev))) {
 			log_err("Couldn't insert device into binary tree.");
 			_free(dev);
 			return 0;
@@ -236,21 +108,43 @@ static int _insert_dev(const char *path, dev_t d)
 	}
 
 	if (!_add_alias(dev, path)) {
-		log_err("Couldn't add alias to dev cache.");
+		log_err("Couldn't add alias to dir cache.");
 		return 0;
 	}
 
 	if (!hash_insert(_cache.names, path, dev)) {
-		log_err("Couldn't add name to hash in dev cache.");
+		log_err("Couldn't add name to hash in dir cache.");
 		return 0;
 	}
 
 	return 1;
 }
 
+/*
+ * return a new path for the destination of the link.
+ */
+static char *_follow_link(const char *path, struct stat *info)
+{
+	char buffer[PATH_MAX + 1];
+	int n;
+	n = readlink(path, buffer, sizeof(buffer) - 1);
+
+	if (n <= 0)
+		return NULL;
+
+	buffer[n] = '\0';
+
+	if (stat(buffer, info) < 0) {
+		log_sys_very_verbose("stat", buffer);
+		return NULL;
+	}
+
+	return pool_strdup(_cache.mem, buffer);
+}
+
 static char *_join(const char *dir, const char *name)
 {
-	size_t len = strlen(dir) + strlen(name) + 2;
+	int len = strlen(dir) + strlen(name) + 2;
 	char *r = dbg_malloc(len);
 	if (r)
 		snprintf(r, len, "%s/%s", dir, name);
@@ -314,6 +208,7 @@ static int _insert_dir(const char *dir)
 static int _insert(const char *path, int rec)
 {
 	struct stat info;
+	char *actual_path;
 	int r = 0;
 
 	if (stat(path, &info) < 0) {
@@ -321,18 +216,23 @@ static int _insert(const char *path, int rec)
 		return 0;
 	}
 
-	if (S_ISDIR(info.st_mode)) {	/* add a directory */
-		/* check it's not a symbolic link */
-		if (lstat(path, &info) < 0) {
-			log_sys_very_verbose("lstat", path);
+	/* follow symlinks if neccessary. */
+	if (S_ISLNK(info.st_mode)) {
+		log_debug("%s: Following symbolic link", path);
+		if (!(actual_path = _follow_link(path, &info))) {
+			stack;
 			return 0;
 		}
 
-		if (S_ISLNK(info.st_mode)) {
-			log_debug("%s: Symbolic link to directory", path);
+		if (stat(actual_path, &info) < 0) {
+			log_sys_very_verbose("stat", actual_path);
 			return 0;
 		}
 
+		dbg_free(actual_path);
+	}
+
+	if (S_ISDIR(info.st_mode)) { /* add a directory */
 		if (rec)
 			r = _insert_dir(path);
 
@@ -368,21 +268,6 @@ static void _full_scan(void)
 	_cache.has_scanned = 1;
 }
 
-int dev_cache_has_scanned(void)
-{
-	return _cache.has_scanned;
-}
-
-void dev_cache_scan(int do_scan)
-{
-	if (!do_scan)
-		_cache.has_scanned = 1;
-	else {
-		_cache.has_scanned = 0;
-		_full_scan();
-	}
-}
-
 int dev_cache_init(void)
 {
 	_cache.names = NULL;
@@ -408,40 +293,39 @@ int dev_cache_init(void)
 
 	return 1;
 
-      bad:
+ bad:
 	dev_cache_exit();
 	return 0;
 }
 
-static void _check_closed(struct device *dev)
-{
-	if (dev->fd >= 0)
-		log_err("Device '%s' has been left open.", dev_name(dev));
-}
-
 static inline void _check_for_open_devices(void)
 {
-	hash_iter(_cache.names, (iterate_fn) _check_closed);
+#ifndef NDEBUG
+	struct dev_iter *i = dev_iter_create(NULL);
+	struct device *dev;
+
+	if (!i) {
+		stack;
+		return;
+	}
+
+	while ((dev = dev_iter_get(i))) {
+		if (dev->fd >= 0)
+			log_err("Device '%s' has been left open.",
+				dev_name(dev));
+	}
+
+	dev_iter_destroy(i);
+#endif
 }
 
 void dev_cache_exit(void)
 {
+	_check_for_open_devices();
+
+	pool_destroy(_cache.mem);
 	if (_cache.names)
-		_check_for_open_devices();
-
-	if (_cache.mem) {
-		pool_destroy(_cache.mem);
-		_cache.mem = NULL;
-	}
-
-	if (_cache.names) {
 		hash_destroy(_cache.names);
-		_cache.names = NULL;
-	}
-
-	_cache.devices = NULL;
-	_cache.has_scanned = 0;
-	list_init(&_cache.dirs);
 }
 
 int dev_cache_add_dir(const char *path)
@@ -460,76 +344,18 @@ int dev_cache_add_dir(const char *path)
 		return 1;
 	}
 
-	if (!(dl = _alloc(sizeof(*dl) + strlen(path) + 1))) {
-		log_error("dir_list allocation failed");
+	if (!(dl = _alloc(sizeof(*dl) + strlen(path) + 1)))
 		return 0;
-	}
 
 	strcpy(dl->dir, path);
 	list_add(&_cache.dirs, &dl->list);
 	return 1;
 }
 
-/* Check cached device name is still valid before returning it */
-/* This should be a rare occurrence */
-/* set quiet if the cache is expected to be out-of-date */
-/* FIXME Make rest of code pass/cache struct device instead of dev_name */
-const char *dev_name_confirmed(struct device *dev, int quiet)
-{
-	struct stat buf;
-	const char *name;
-	int r;
-
-	while ((r = stat(name = list_item(dev->aliases.n,
-					  struct str_list)->str, &buf)) ||
-	       (buf.st_rdev != dev->dev)) {
-		if (r < 0) {
-			if (quiet)
-				log_sys_debug("stat", name);
-			else
-				log_sys_error("stat", name);
-		}
-		if (quiet)
-			log_debug("Path %s no longer valid for device(%d,%d)",
-				  name, (int) MAJOR(dev->dev),
-				  (int) MINOR(dev->dev));
-		else
-			log_error("Path %s no longer valid for device(%d,%d)",
-				  name, (int) MAJOR(dev->dev),
-				  (int) MINOR(dev->dev));
-
-		/* Remove the incorrect hash entry */
-		hash_remove(_cache.names, name);
-
-		/* Leave list alone if there isn't an alternative name */
-		/* so dev_name will always find something to return. */
-		/* Otherwise add the name to the correct device. */
-		if (list_size(&dev->aliases) > 1) {
-			list_del(dev->aliases.n);
-			if (!r)
-				_insert(name, 0);
-			continue;
-		}
-
-		log_error("Aborting - please provide new pathname for what "
-			  "used to be %s", name);
-		return NULL;
-	}
-
-	return dev_name(dev);
-}
-
 struct device *dev_cache_get(const char *name, struct dev_filter *f)
 {
-	struct stat buf;
 	struct device *d = (struct device *) hash_lookup(_cache.names, name);
 
-	/* If the entry's wrong, remove it */
-	if (d && (stat(name, &buf) || (buf.st_rdev != d->dev))) {
-		hash_remove(_cache.names, name);
-		d = NULL;
-	}
-
 	if (!d) {
 		_insert(name, 0);
 		d = (struct device *) hash_lookup(_cache.names, name);
@@ -542,10 +368,8 @@ struct dev_iter *dev_iter_create(struct dev_filter *f)
 {
 	struct dev_iter *di = dbg_malloc(sizeof(*di));
 
-	if (!di) {
-		log_error("dev_iter allocation failed");
+	if (!di)
 		return NULL;
-	}
 
 	_full_scan();
 	di->current = btree_first(_cache.devices);
@@ -577,3 +401,6 @@ struct device *dev_iter_get(struct dev_iter *iter)
 
 	return NULL;
 }
+
+
+

lib/device/dev-cache.h

@@ -1,21 +1,13 @@
 /*
- * 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_DEV_CACHE_H
 #define _LVM_DEV_CACHE_H
 
+#include <sys/types.h>
 #include "lvm-types.h"
 #include "device.h"
 
@@ -23,24 +15,22 @@
  * predicate for devices.
  */
 struct dev_filter {
-	int (*passes_filter) (struct dev_filter * f, struct device * dev);
-	void (*destroy) (struct dev_filter * f);
+	int (*passes_filter)(struct dev_filter *f, struct device *dev);
+	void (*destroy)(struct dev_filter *f);
 	void *private;
 };
 
+
 /*
  * The global device cache.
  */
 int dev_cache_init(void);
 void dev_cache_exit(void);
 
-/* Trigger(1) or avoid(0) a scan */
-void dev_cache_scan(int do_scan);
-int dev_cache_has_scanned(void);
-
 int dev_cache_add_dir(const char *path);
 struct device *dev_cache_get(const char *name, struct dev_filter *f);
 
+
 /*
  * Object for iterating through the cache.
  */

lib/device/dev-io.c

@@ -1,226 +1,25 @@
 /*
- * 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 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 LGPL.
  */
 
-#include "lib.h"
-#include "lvm-types.h"
 #include "device.h"
-#include "metadata.h"
-#include "lvmcache.h"
-#include "memlock.h"
-#include "locking.h"
+#include "lvm-types.h"
+#include "log.h"
 
-#include <limits.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#include <sys/mount.h>
 
-#ifdef linux
-#  define u64 uint64_t		/* Missing without __KERNEL__ */
-#  undef WNOHANG		/* Avoid redefinition */
-#  undef WUNTRACED		/* Avoid redefinition */
-#  include <linux/fs.h>		/* For block ioctl definitions */
-#  define BLKSIZE_SHIFT SECTOR_SHIFT
-#  ifndef BLKGETSIZE64		/* fs.h out-of-date */
-#    define BLKGETSIZE64 _IOR(0x12, 114, size_t)
-#  endif /* BLKGETSIZE64 */
-#else
-#  include <sys/disk.h>
-#  define BLKBSZGET DKIOCGETBLOCKSIZE
-#  define BLKSSZGET DKIOCGETBLOCKSIZE
-#  define BLKGETSIZE64 DKIOCGETBLOCKCOUNT
-#  define BLKFLSBUF DKIOCSYNCHRONIZECACHE
-#  define BLKSIZE_SHIFT 0
-#endif
-
-#ifdef O_DIRECT_SUPPORT
-#  ifndef O_DIRECT
-#    error O_DIRECT support configured but O_DIRECT definition not found in headers
-#  endif
-#endif
-
-
-/* FIXME Use _llseek for 64-bit
-_syscall5(int,  _llseek,  uint,  fd, ulong, hi, ulong, lo, loff_t *, res, uint, wh);
- if (_llseek((unsigned) fd, (ulong) (offset >> 32), (ulong) (offset & 0xFFFFFFFF), &pos, SEEK_SET) < 0) { 
-*/
-
-static LIST_INIT(_open_devices);
-
-/*-----------------------------------------------------------------
- * The standard io loop that keeps submitting an io until it's
- * all gone.
- *---------------------------------------------------------------*/
-static int _io(struct device_area *where, void *buffer, int should_write)
-{
-	int fd = dev_fd(where->dev);
-	ssize_t n = 0;
-	size_t total = 0;
-
-	if (fd < 0) {
-		log_error("Attempt to read an unopened device (%s).",
-			  dev_name(where->dev));
-		return 0;
-	}
-
-	/*
-	 * Skip all writes in test mode.
-	 */
-	if (should_write && test_mode())
-		return 1;
-
-	if (where->size > SSIZE_MAX) {
-		log_error("Read size too large: %" PRIu64, where->size);
-		return 0;
-	}
-
-	if (lseek(fd, (off_t) where->start, SEEK_SET) < 0) {
-		log_sys_error("lseek", dev_name(where->dev));
-		return 0;
-	}
-
-	while (total < (size_t) where->size) {
-		do
-			n = should_write ?
-			    write(fd, buffer, (size_t) where->size - total) :
-			    read(fd, buffer, (size_t) where->size - total);
-		while ((n < 0) && ((errno == EINTR) || (errno == EAGAIN)));
-
-		if (n <= 0)
-			break;
-
-		total += n;
-		buffer += n;
-	}
-
-	return (total == (size_t) where->size);
-}
-
-/*-----------------------------------------------------------------
- * LVM2 uses O_DIRECT when performing metadata io, which requires
- * block size aligned accesses.  If any io is not aligned we have
- * to perform the io via a bounce buffer, obviously this is quite
- * inefficient.
- *---------------------------------------------------------------*/
-
-/*
- * Get the sector size from an _open_ device.
- */
-static int _get_block_size(struct device *dev, unsigned int *size)
-{
-	int s;
-
-	if (ioctl(dev_fd(dev), BLKBSZGET, &s) < 0) {
-		log_sys_error("ioctl BLKBSZGET", dev_name(dev));
-		return 0;
-	}
-
-	*size = (unsigned int) s;
-	return 1;
-}
-
-/*
- * Widens a region to be an aligned region.
- */
-static void _widen_region(unsigned int block_size, struct device_area *region,
-			  struct device_area *result)
-{
-	uint64_t mask = block_size - 1, delta;
-	memcpy(result, region, sizeof(*result));
-
-	/* adjust the start */
-	delta = result->start & mask;
-	if (delta) {
-		result->start -= delta;
-		result->size += delta;
-	}
-
-	/* adjust the end */
-	delta = (result->start + result->size) & mask;
-	if (delta)
-		result->size += block_size - delta;
-}
-
-static int _aligned_io(struct device_area *where, void *buffer,
-		       int should_write)
-{
-	void *bounce;
-	unsigned int block_size = 0;
-	uintptr_t mask;
-	struct device_area widened;
-
-	if (!(where->dev->flags & DEV_REGULAR) &&
-	    !_get_block_size(where->dev, &block_size)) {
-		stack;
-		return 0;
-	}
-
-	if (!block_size)
-		block_size = getpagesize();
-
-	_widen_region(block_size, where, &widened);
-
-	/* Do we need to use a bounce buffer? */
-	mask = block_size - 1;
-	if (!memcmp(where, &widened, sizeof(widened)) &&
-	    !((uintptr_t) buffer & mask))
-		return _io(where, buffer, should_write);
-
-	/* Allocate a bounce buffer with an extra block */
-	if (!(bounce = alloca((size_t) widened.size + block_size))) {
-		log_error("Bounce buffer alloca failed");
-		return 0;
-	}
-
-	/*
-	 * Realign start of bounce buffer (using the extra sector)
-	 */
-	if (((uintptr_t) bounce) & mask)
-		bounce = (void *) ((((uintptr_t) bounce) + mask) & ~mask);
-
-	/* channel the io through the bounce buffer */
-	if (!_io(&widened, bounce, 0)) {
-		if (!should_write) {
-			stack;
-			return 0;
-		}
-		/* FIXME pre-extend the file */
-		memset(bounce, '\n', widened.size);
-	}
-
-	if (should_write) {
-		memcpy(bounce + (where->start - widened.start), buffer,
-		       (size_t) where->size);
-
-		/* ... then we write */
-		return _io(&widened, bounce, 1);
-	}
-
-	memcpy(buffer, bounce + (where->start - widened.start),
-	       (size_t) where->size);
-
-	return 1;
-}
-
-/*-----------------------------------------------------------------
- * Public functions
- *---------------------------------------------------------------*/
 
 int dev_get_size(struct device *dev, uint64_t *size)
 {
 	int fd;
+	long s;
 	const char *name = dev_name(dev);
 
 	log_very_verbose("Getting size of %s", name);
@@ -229,150 +28,37 @@ int dev_get_size(struct device *dev, uint64_t *size)
 		return 0;
 	}
 
-	if (ioctl(fd, BLKGETSIZE64, size) < 0) {
-		log_sys_error("ioctl BLKGETSIZE64", name);
+	/* FIXME: add 64 bit ioctl */
+	if (ioctl(fd, BLKGETSIZE, &s) < 0) {
+		log_sys_error("ioctl BLKGETSIZE", name);
 		close(fd);
 		return 0;
 	}
 
-	*size >>= BLKSIZE_SHIFT;	/* Convert to sectors */
 	close(fd);
+	*size = (uint64_t) s;
 	return 1;
 }
 
-int dev_get_sectsize(struct device *dev, uint32_t *size)
+int dev_open(struct device *dev, int flags)
 {
-	int fd;
-	int s;
 	const char *name = dev_name(dev);
 
-	log_very_verbose("Getting size of %s", name);
-	if ((fd = open(name, O_RDONLY)) < 0) {
-		log_sys_error("open", name);
-		return 0;
-	}
-
-	if (ioctl(fd, BLKSSZGET, &s) < 0) {
-		log_sys_error("ioctl BLKSSZGET", name);
-		close(fd);
-		return 0;
-	}
-
-	close(fd);
-	*size = (uint32_t) s;
-	return 1;
-}
-
-void dev_flush(struct device *dev)
-{
-	if (!(dev->flags & DEV_REGULAR) && ioctl(dev->fd, BLKFLSBUF, 0) >= 0)
-		return;
-
-	if (fsync(dev->fd) >= 0)
-		return;
-
-	sync();
-}
-
-int dev_open_flags(struct device *dev, int flags, int direct, int quiet)
-{
-	struct stat buf;
-	const char *name;
-
+	/* FIXME Check flags (eg is write now reqd?) */
 	if (dev->fd >= 0) {
-		dev->open_count++;
-		return 1;
-	}
-
-	if (memlock())
-		log_error("WARNING: dev_open(%s) called while suspended",
-			  dev_name(dev));
-
-	if (dev->flags & DEV_REGULAR)
-		name = dev_name(dev);
-	else if (!(name = dev_name_confirmed(dev, quiet))) {
-		stack;
+		log_error("Device '%s' has already been opened", name);
 		return 0;
 	}
 
-	if (!(dev->flags & DEV_REGULAR) &&
-	    ((stat(name, &buf) < 0) || (buf.st_rdev != dev->dev))) {
-		log_error("%s: stat failed: Has device name changed?", name);
-		return 0;
-	}
-
-#ifdef O_DIRECT_SUPPORT
-	if (direct)
-		flags |= O_DIRECT;
-#endif
-
-	if ((dev->fd = open(name, flags, 0777)) < 0) {
+	if ((dev->fd = open(name, flags)) < 0) {
 		log_sys_error("open", name);
 		return 0;
 	}
 
-	dev->open_count = 1;
-	dev->flags &= ~DEV_ACCESSED_W;
-
-	if (!(dev->flags & DEV_REGULAR) &&
-	    ((fstat(dev->fd, &buf) < 0) || (buf.st_rdev != dev->dev))) {
-		log_error("%s: fstat failed: Has device name changed?", name);
-		dev_close(dev);
-		dev->fd = -1;
-		return 0;
-	}
-
-#ifndef O_DIRECT_SUPPORT
-	if (!(dev->flags & DEV_REGULAR))
-		dev_flush(dev);
-#endif
-
-	if ((flags & O_CREAT) && !(flags & O_TRUNC)) {
-		dev->end = lseek(dev->fd, (off_t) 0, SEEK_END);
-	}
-
-	list_add(&_open_devices, &dev->open_list);
-	log_debug("Opened %s", dev_name(dev));
-
 	return 1;
 }
 
-int dev_open_quiet(struct device *dev)
-{
-	int flags;
-
-	flags = vg_write_lock_held() ? O_RDWR : O_RDONLY;
-
-	return dev_open_flags(dev, flags, 1, 1);
-}
-
-int dev_open(struct device *dev)
-{
-	int flags;
-
-	flags = vg_write_lock_held() ? O_RDWR : O_RDONLY;
-
-	return dev_open_flags(dev, flags, 1, 0);
-}
-
-static void _close(struct device *dev)
-{
-	if (close(dev->fd))
-		log_sys_error("close", dev_name(dev));
-	dev->fd = -1;
-	list_del(&dev->open_list);
-
-	log_debug("Closed %s", dev_name(dev));
-
-	if (dev->flags & DEV_ALLOCED) {
-		dbg_free((void *) list_item(dev->aliases.n, struct str_list)->
-			 str);
-		dbg_free(dev->aliases.n);
-		dbg_free(dev);
-	}
-}
-
-static int _dev_close(struct device *dev, int immediate)
+int dev_close(struct device *dev)
 {
 	if (dev->fd < 0) {
 		log_error("Attempt to close device '%s' "
@@ -380,127 +66,127 @@ static int _dev_close(struct device *dev, int immediate)
 		return 0;
 	}
 
-#ifndef O_DIRECT_SUPPORT
-	if (dev->flags & DEV_ACCESSED_W)
-		dev_flush(dev);
-#endif
+	if (close(dev->fd))
+		log_sys_error("close", dev_name(dev));
 
-	/* FIXME lookup device in cache to get vgname and see if it's locked? */
-	if (--dev->open_count < 1 && (immediate || !vgs_locked()))
-		_close(dev);
+	dev->fd = -1;
 
 	return 1;
 }
 
-int dev_close(struct device *dev)
-{
-	return _dev_close(dev, 0);
-}
-
-int dev_close_immediate(struct device *dev)
-{
-	return _dev_close(dev, 1);
-}
-
-void dev_close_all(void)
-{
-	struct list *doh, *doht;
-	struct device *dev;
-
-	list_iterate_safe(doh, doht, &_open_devices) {
-		dev = list_struct_base(doh, struct device, open_list);
-		if (dev->open_count < 1)
-			_close(dev);
-	}
-}
-
-int dev_read(struct device *dev, uint64_t offset, size_t len, void *buffer)
-{
-	struct device_area where;
-
-	if (!dev->open_count)
-		return 0;
-
-	where.dev = dev;
-	where.start = offset;
-	where.size = len;
-
-	return _aligned_io(&where, buffer, 0);
-}
-
-/* FIXME If O_DIRECT can't extend file, dev_extend first; dev_truncate after.
- *       But fails if concurrent processes writing
+/*
+ *  FIXME: factor common code out.
  */
-
-/* FIXME pre-extend the file */
-int dev_append(struct device *dev, size_t len, void *buffer)
+int _read(int fd, void *buf, size_t count)
 {
-	int r;
+	size_t n = 0;
+	int tot = 0;
 
-	if (!dev->open_count)
-		return 0;
+	while (tot < count) {
+		do
+			n = read(fd, buf, count - tot);
+		while ((n < 0) && ((errno == EINTR) || (errno == EAGAIN)));
 
-	r = dev_write(dev, dev->end, len, buffer);
-	dev->end += (uint64_t) len;
+		if (n <= 0)
+			return tot ? tot : n;
 
-#ifndef O_DIRECT_SUPPORT
-	dev_flush(dev);
-#endif
-	return r;
+		tot += n;
+		buf += n;
+	}
+
+	return tot;
 }
 
-int dev_write(struct device *dev, uint64_t offset, size_t len, void *buffer)
+int64_t dev_read(struct device *dev, uint64_t offset,
+		 int64_t len, void *buffer)
 {
-	struct device_area where;
+	const char *name = dev_name(dev);
+	int fd = dev->fd;
 
-	if (!dev->open_count)
-		return 0;
-
-	where.dev = dev;
-	where.start = offset;
-	where.size = len;
-
-	dev->flags |= DEV_ACCESSED_W;
-
-	return _aligned_io(&where, buffer, 1);
-}
-
-int dev_zero(struct device *dev, uint64_t offset, size_t len)
-{
-	size_t s;
-	char buffer[4096];
-
-	if (!dev_open(dev)) {
-		stack;
+	if (fd < 0) {
+		log_err("Attempt to read an unopened device (%s).", name);
 		return 0;
 	}
 
-	if ((offset % SECTOR_SIZE) || (len % SECTOR_SIZE))
-		log_debug("Wiping %s at %" PRIu64 " length %" PRIsize_t,
-			  dev_name(dev), offset, len);
-	else
-		log_debug("Wiping %s at sector %" PRIu64 " length %" PRIsize_t
-			  " sectors", dev_name(dev), offset >> SECTOR_SHIFT,
-			  len >> SECTOR_SHIFT);
+	if (lseek(fd, offset, SEEK_SET) < 0) {
+		log_sys_error("lseek", name);
+		return 0;
+	}
+
+	return _read(fd, buffer, len);
+}
+
+int _write(int fd, const void *buf, size_t count)
+{
+	size_t n = 0;
+	int tot = 0;
+
+	while (tot < count) {
+		do
+			n = write(fd, buf, count - tot);
+		while ((n < 0) && ((errno == EINTR) || (errno == EAGAIN)));
+
+		if (n <= 0)
+			return tot ? tot : n;
+
+		tot += n;
+		buf += n;
+	}
+
+	return tot;
+}
+
+int64_t dev_write(struct device *dev, uint64_t offset,
+		  int64_t len, void *buffer)
+{
+	const char *name = dev_name(dev);
+	int fd = dev->fd;
+
+	if (fd < 0) {
+		log_error("Attempt to write to unopened device %s", name);
+		return 0;
+	}
+
+	if (lseek(fd, offset, SEEK_SET) < 0) {
+		log_sys_error("lseek", name);
+		return 0;
+	}
+
+	return _write(fd, buffer, len);
+}
+
+int dev_zero(struct device *dev, uint64_t offset, int64_t len)
+{
+	int64_t r, s;
+	char buffer[4096];
+	const char *name = dev_name(dev);
+	int fd = dev->fd;
+
+	if (fd < 0) {
+		log_error("Attempt to zero part of an unopened device %s", 
+			  name);
+		return 0;
+	}
+
+	if (lseek(fd, offset, SEEK_SET) < 0) {
+		log_sys_error("lseek", name);
+		return 0;
+	}
 
 	memset(buffer, 0, sizeof(buffer));
 	while (1) {
 		s = len > sizeof(buffer) ? sizeof(buffer) : len;
-		if (!dev_write(dev, offset, s, buffer))
+		r = _write(fd, buffer, s);
+
+		if (r <= 0)
 			break;
 
-		len -= s;
-		if (!len)
+		len -= r;
+		if (!len) {
+			r = 1;
 			break;
-
-		offset += s;
+		}
 	}
 
-	dev->flags |= DEV_ACCESSED_W;
-
-	if (!dev_close(dev))
-		stack;
-
-	/* FIXME: Always display error */
 	return (len == 0);
 }

lib/device/device.c

@@ -1,31 +1,32 @@
 /*
- * 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 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
  */
 
-#if 0
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
-
+#include <string.h>
 #include <errno.h>
 #include <sys/ioctl.h>
-#include <linux/fs.h>
-#include <linux/major.h>
-#include <linux/genhd.h>
 
 #include "dbg_malloc.h"
 #include "log.h"
@@ -33,6 +34,13 @@
 #include "metadata.h"
 #include "device.h"
 
+#include <linux/fs.h>
+#include <linux/major.h>
+#include <linux/genhd.h>
+
+
+
+#if 0
 int _get_partition_type(struct dev_filter *filter, struct device *d);
 
 #define MINOR_PART(dm, d) (MINOR((d)->dev) % dev_max_partitions(dm, (d)->dev))

lib/device/device.h

@@ -1,103 +1,50 @@
 /*
- * 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_DEVICE_H
 #define _LVM_DEVICE_H
 
-#include "uuid.h"
-#include <fcntl.h>
-
-#define DEV_ACCESSED_W		0x00000001	/* Device written to? */
-#define DEV_REGULAR		0x00000002	/* Regular file? */
-#define DEV_ALLOCED		0x00000004	/* dbg_malloc used */
+#include "lvm-types.h"
+#include "list.h"
 
 /*
  * All devices in LVM will be represented by one of these.
  * pointer comparisons are valid.
  */
 struct device {
-	struct list aliases;	/* struct str_list from lvm-types.h */
+	struct list aliases; /* struct str_list from lvm-types.h */
 	dev_t dev;
 
 	/* private */
 	int fd;
-	int open_count;
-	uint32_t flags;
-	uint64_t end;
-	struct list open_list;
-
-	char pvid[ID_LEN + 1];
-};
-
-struct device_list {
-	struct list list;
-	struct device *dev;
-};
-
-struct device_area {
-	struct device *dev;
-	uint64_t start;		/* Bytes */
-	uint64_t size;		/* Bytes */
 };
 
 /*
  * All io should use these routines.
  */
 int dev_get_size(struct device *dev, uint64_t *size);
-int dev_get_sectsize(struct device *dev, uint32_t *size);
 
-/* Use quiet version if device number could change e.g. when opening LV */
-int dev_open(struct device *dev);
-int dev_open_quiet(struct device *dev);
-int dev_open_flags(struct device *dev, int flags, int append, int quiet);
+int dev_open(struct device *dev, int flags);
 int dev_close(struct device *dev);
-int dev_close_immediate(struct device *dev);
-void dev_close_all(void);
 
-static inline int dev_fd(struct device *dev)
-{
-	return dev->fd;
+int64_t dev_read(struct device *dev,
+		 uint64_t offset, int64_t len, void *buffer);
+int64_t dev_write(struct device *dev,
+		  uint64_t offset, int64_t len, void *buffer);
+int dev_zero(struct device *dev, uint64_t offset, int64_t len);
+
+
+static inline const char *dev_name(struct device *dev) {
+	return list_item(dev->aliases.n, struct str_list)->str;
 }
 
-int dev_read(struct device *dev, uint64_t offset, size_t len, void *buffer);
-int dev_write(struct device *dev, uint64_t offset, size_t len, void *buffer);
-int dev_append(struct device *dev, size_t len, void *buffer);
-int dev_zero(struct device *dev, uint64_t offset, size_t len);
-void dev_flush(struct device *dev);
 
-struct device *dev_create_file(const char *filename, struct device *dev,
-			       struct str_list *alias);
-
-static inline const char *dev_name(const struct device *dev)
-{
-	return (dev) ? list_item(dev->aliases.n, struct str_list)->str :
-	    "unknown device";
-}
-
-/* Return a valid device name from the alias list; NULL otherwise */
-const char *dev_name_confirmed(struct device *dev, int quiet);
-
-/* FIXME Check partition type if appropriate */
-
-#define is_lvm_partition(a) 1
-
-/*
-static inline int is_lvm_partition(const char *name)
-{
+static inline int is_lvm_partition(const char *name) {
 	return 1;
 }
-*/
 
 #endif
+

lib/display/display.h

@@ -1,16 +1,21 @@
 /*
- * 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 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 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
  *
- * 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_DISPLAY_H
@@ -20,40 +25,29 @@
 
 #include <stdint.h>
 
-typedef enum { SIZE_LONG = 0, SIZE_SHORT = 1, SIZE_UNIT = 2 } size_len_t;
-
-uint64_t units_to_bytes(const char *units, char *unit_type);
+typedef	enum {SIZE_LONG=0, SIZE_SHORT=1} size_len_t;
 
 /* Specify size in KB */
-const char *display_size(struct cmd_context *cmd, uint64_t size, size_len_t sl);
+char *display_size(unsigned long long size, size_len_t sl);
 char *display_uuid(char *uuidstr);
 
 void pvdisplay_colons(struct physical_volume *pv);
-void pvdisplay_full(struct cmd_context *cmd, struct physical_volume *pv,
-		    void *handle);
-int pvdisplay_short(struct cmd_context *cmd, struct volume_group *vg,
-		    struct physical_volume *pv, void *handle);
+void pvdisplay_full(struct physical_volume *pv);
 
 void lvdisplay_colons(struct logical_volume *lv);
-int lvdisplay_segments(struct logical_volume *lv);
-int lvdisplay_full(struct cmd_context *cmd, struct logical_volume *lv,
-		   void *handle);
+void lvdisplay_extents(struct logical_volume *lv);
+void lvdisplay_full(struct logical_volume *lv);
 
-void vgdisplay_extents(struct volume_group *vg);
-void vgdisplay_full(struct volume_group *vg);
-void vgdisplay_colons(struct volume_group *vg);
-void vgdisplay_short(struct volume_group *vg);
+#if 0
+void pv_show_short(pv_t * pv);
+void pv_display_pe(pv_t * pv, pe_disk_t * pe);
+void pv_display_pe_free(int pe_free, int p);
+void pv_display_pe_text(pv_t * pv, pe_disk_t * pe, lv_disk_t * lvs);
 
-/*
- * Allocation policy display conversion routines.
- */
-const char *get_alloc_string(alloc_policy_t alloc);
-alloc_policy_t get_alloc_from_string(const char *str);
-
-/*
- * Segment type display conversion routines.
- */
-segment_type_t get_segtype_from_string(const char *str);
-const char *get_segtype_string(segment_type_t segtype);
+static inline unsigned long get_pe_offset(ulong p, pv_t *pv)
+{
+        return pv->pe_start + (p * pv->pe_size);
+}
 
 #endif
+#endif

lib/filters/filter-composite.c

@@ -1,20 +1,12 @@
 /*
- * 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 LGPL.
  */
 
-#include "lib.h"
 #include "filter-composite.h"
+#include "dbg_malloc.h"
+#include "log.h"
 
 #include <stdarg.h>
 
@@ -28,8 +20,6 @@ static int _and_p(struct dev_filter *f, struct device *dev)
 		filters++;
 	}
 
-	log_debug("Using %s", dev_name(dev));
-
 	return 1;
 }
 
@@ -46,32 +36,36 @@ static void _destroy(struct dev_filter *f)
 	dbg_free(f);
 }
 
-struct dev_filter *composite_filter_create(int n, struct dev_filter **filters)
+
+struct dev_filter *composite_filter_create(int n, ...)
 {
-	struct dev_filter **filters_copy, *cf;
+	struct dev_filter **filters = dbg_malloc(sizeof(*filters) * (n + 1));
+	struct dev_filter *cf;
+	va_list ap;
+	int i;
 
 	if (!filters) {
 		stack;
 		return NULL;
 	}
 
-	if (!(filters_copy = dbg_malloc(sizeof(*filters) * (n + 1)))) {
-		log_error("composite filters allocation failed");
-		return NULL;
-	}
-
-	memcpy(filters_copy, filters, sizeof(*filters) * n);
-	filters_copy[n] = NULL;
-
 	if (!(cf = dbg_malloc(sizeof(*cf)))) {
-		log_error("compsoite filters allocation failed");
-		dbg_free(filters_copy);
+		stack;
+		dbg_free(filters);
 		return NULL;
 	}
 
+	va_start(ap, n);
+	for (i = 0; i < n; i++) {
+		struct dev_filter *f = va_arg(ap, struct dev_filter *);
+		filters[i] = f;
+	}
+	filters[i] = NULL;
+	va_end(ap);
+
 	cf->passes_filter = _and_p;
 	cf->destroy = _destroy;
-	cf->private = filters_copy;
+	cf->private = filters;
 
 	return cf;
 }

lib/filters/filter-composite.h

@@ -1,16 +1,7 @@
 /*
- * 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_FILTER_COMPOSITE_H
@@ -18,6 +9,6 @@
 
 #include "dev-cache.h"
 
-struct dev_filter *composite_filter_create(int n, struct dev_filter **filters);
+struct dev_filter *composite_filter_create(int n, ...);
 
 #endif